tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

android: Update JSC and compat new api

Browse Source
This commit is contained in:
pengfei.zhou
2022-03-09 17:35:13 +08:00
committed by osborn
parent 774d3160a9
commit 8aebbc7a36
19 changed files with 1906 additions and 3122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
doric-js/bundle/doric-lib.es5.js
View File

@@ -68,7 +68,7 @@ var Mutable = /** @class */ (function () {
*/
var __uniqueId__ = 0;
function uniqueId(prefix) {
return "__".concat(prefix, "_").concat(__uniqueId__++, "__");
return "__" + prefix + "_" + __uniqueId__++ + "__";
}
function toString(message) {
@@ -177,11 +177,11 @@ var __values$5 = (undefined && undefined.__values) || function(o) {
function Property(target, propKey) {
Object.defineProperty(target, propKey, {
get: function () {
return Reflect.get(this, "__prop__".concat(propKey), this);
return Reflect.get(this, "__prop__" + propKey, this);
},
set: function (v) {
var oldV = Reflect.get(this, "__prop__".concat(propKey), this);
Reflect.set(this, "__prop__".concat(propKey), v, this);
var oldV = Reflect.get(this, "__prop__" + propKey, this);
Reflect.set(this, "__prop__" + propKey, v, this);
if (oldV !== v) {
Reflect.apply(this.onPropertyChanged, this, [propKey, oldV, v]);
}
@@ -191,11 +191,11 @@ function Property(target, propKey) {
function InconsistProperty(target, propKey) {
Object.defineProperty(target, propKey, {
get: function () {
return Reflect.get(this, "__prop__".concat(propKey), this);
return Reflect.get(this, "__prop__" + propKey, this);
},
set: function (v) {
var oldV = Reflect.get(this, "__prop__".concat(propKey), this);
Reflect.set(this, "__prop__".concat(propKey), v, this);
var oldV = Reflect.get(this, "__prop__" + propKey, this);
Reflect.set(this, "__prop__" + propKey, v, this);
Reflect.apply(this.onPropertyChanged, this, [propKey, oldV, v]);
},
});
@@ -373,7 +373,7 @@ var View = /** @class */ (function () {
return Reflect.apply(f, this, argumentsList);
}
else {
loge("Cannot find callback:".concat(id, " for ").concat(JSON.stringify(this.toModel())));
loge("Cannot find callback:" + id + " for " + JSON.stringify(this.toModel()));
}
};
View.prototype.toModel = function () {
@@ -714,7 +714,7 @@ var Group = /** @class */ (function (_super) {
this.addChild(e);
}
else {
loge("Not allowed to add ".concat(typeof e));
loge("Not allowed to add " + typeof e);
}
};
Object.defineProperty(Group.prototype, "innerElement", {
@@ -1225,7 +1225,7 @@ var Panel = /** @class */ (function () {
var v = this.retrospectView(viewIds);
if (v === undefined) {
loge("Cannot find view for ".concat(viewIds));
loge("Cannot find view for " + viewIds);
}
else {
var argumentsList = [callbackId];
@@ -1427,7 +1427,7 @@ var Color = /** @class */ (function () {
}
Color.parse = function (str) {
if (!str.startsWith("#")) {
throw new Error("Parse color error with ".concat(str));
throw new Error("Parse color error with " + str);
}
var val = parseInt(str.substr(1), 16);
if (str.length === 7) {
@@ -1437,7 +1437,7 @@ var Color = /** @class */ (function () {
return new Color(val);
}
else {
throw new Error("Parse color error with ".concat(str));
throw new Error("Parse color error with " + str);
}
};
Color.safeParse = function (str, defVal) {
@@ -2240,10 +2240,24 @@ var MainBundleResource = /** @class */ (function (_super) {
var BundleResource = /** @class */ (function (_super) {
__extends$f(BundleResource, _super);
function BundleResource(bundleName, fileName) {
return _super.call(this, "bundle", "".concat(bundleName, "://").concat(fileName)) || this;
return _super.call(this, "bundle", bundleName + "://" + fileName) || this;
}
return BundleResource;
}(iOSResource));
var ArrayBufferResource = /** @class */ (function (_super) {
__extends$f(ArrayBufferResource, _super);
function ArrayBufferResource(data) {
var _this = _super.call(this, "arrayBuffer", uniqueId("buffer")) || this;
_this.data = data;
return _this;
}
ArrayBufferResource.prototype.toModel = function () {
var ret = _super.prototype.toModel.call(this);
ret.data = this.data;
return ret;
};
return ArrayBufferResource;
}(Resource));
var __extends$e = (undefined && undefined.__extends) || (function () {
var extendStatics = function (d, b) {
@@ -2508,7 +2522,7 @@ var List = /** @class */ (function (_super) {
List.prototype.getItem = function (itemIdx) {
var view = this.renderItem(itemIdx);
view.superview = this;
this.cachedViews.set("".concat(itemIdx), view);
this.cachedViews.set("" + itemIdx, view);
return view;
};
List.prototype.renderBunchedItems = function (start, length) {
@@ -2642,7 +2656,7 @@ var Slider = /** @class */ (function (_super) {
Slider.prototype.getItem = function (itemIdx) {
var view = this.renderPage(itemIdx);
view.superview = this;
this.cachedViews.set("".concat(itemIdx), view);
this.cachedViews.set("" + itemIdx, view);
return view;
};
Slider.prototype.renderBunchedItems = function (start, length) {
@@ -3006,7 +3020,7 @@ exports.jsx = void 0;
Reflect.set(e, "innerElement", children, e);
}
else {
throw new Error("Do not support ".concat(constructor.name, " for ").concat(children));
throw new Error("Do not support " + constructor.name + " for " + children);
}
}
return e;
@@ -3124,7 +3138,7 @@ var FlowLayout = /** @class */ (function (_super) {
FlowLayout.prototype.getItem = function (itemIdx) {
var view = this.renderItem(itemIdx);
view.superview = this;
this.cachedViews.set("".concat(itemIdx), view);
this.cachedViews.set("" + itemIdx, view);
return view;
};
FlowLayout.prototype.renderBunchedItems = function (start, length) {
@@ -3805,7 +3819,7 @@ function navbar(context) {
}
function internalScheme(context, panelClass) {
return "_internal_://export?class=".concat(encodeURIComponent(panelClass.name), "&context=").concat(context.id);
return "_internal_://export?class=" + encodeURIComponent(panelClass.name) + "&context=" + context.id;
}
function navigator(context) {
var moduleName = "navigator";
@@ -3845,9 +3859,9 @@ function transformRequest(request) {
if (request.params !== undefined) {
var queryStrings = [];
for (var key in request.params) {
queryStrings.push("".concat(key, "=").concat(encodeURIComponent(request.params[key])));
queryStrings.push(key + "=" + encodeURIComponent(request.params[key]));
}
request.url = "".concat(request.url).concat(url.indexOf('?') >= 0 ? '&' : '?').concat(queryStrings.join('&'));
request.url = "" + request.url + (url.indexOf('?') >= 0 ? '&' : '?') + queryStrings.join('&');
}
if (typeof request.data === 'object') {
request.data = JSON.stringify(request.data);
@@ -4123,7 +4137,7 @@ function animate(context) {
}
else {
return function (args) {
return Promise.reject("Cannot find panel in Context:".concat(context.id));
return Promise.reject("Cannot find panel in Context:" + context.id);
};
}
}
@@ -4617,6 +4631,7 @@ exports.AlphaAnimation = AlphaAnimation;
exports.AndroidAssetsResource = AndroidAssetsResource;
exports.AndroidResource = AndroidResource;
exports.AnimationSet = AnimationSet;
exports.ArrayBufferResource = ArrayBufferResource;
exports.AssetsResource = AssetsResource;
exports.BOTTOM = BOTTOM;
exports.BackgroundColorAnimation = BackgroundColorAnimation;

12
doric-js/bundle/doric-lib.js
View File

@@ -1680,6 +1680,17 @@ class BundleResource extends iOSResource {
super("bundle", `${bundleName}://${fileName}`);
}
}
class ArrayBufferResource extends Resource {
constructor(data) {
super("arrayBuffer", uniqueId("buffer"));
this.data = data;
}
toModel() {
const ret = super.toModel();
ret.data = this.data;
return ret;
}
}
var __decorate$b = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -3518,6 +3529,7 @@ exports.AlphaAnimation = AlphaAnimation;
exports.AndroidAssetsResource = AndroidAssetsResource;
exports.AndroidResource = AndroidResource;
exports.AnimationSet = AnimationSet;
exports.ArrayBufferResource = ArrayBufferResource;
exports.AssetsResource = AssetsResource;
exports.BOTTOM = BOTTOM;
exports.BackgroundColorAnimation = BackgroundColorAnimation;

4744
doric-js/bundle/doric-sandbox.es5.js
View File

File diff suppressed because it is too large Load Diff

12
doric-js/bundle/doric-vm.js
View File

@@ -3208,6 +3208,17 @@ class BundleResource extends iOSResource {
super("bundle", `${bundleName}://${fileName}`);
}
}
class ArrayBufferResource extends Resource {
constructor(data) {
super("arrayBuffer", uniqueId("buffer"));
this.data = data;
}
toModel() {
const ret = super.toModel();
ret.data = this.data;
return ret;
}
}
var __decorate$b = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -5287,6 +5298,7 @@ exports.AlphaAnimation = AlphaAnimation;
exports.AndroidAssetsResource = AndroidAssetsResource;
exports.AndroidResource = AndroidResource;
exports.AnimationSet = AnimationSet;
exports.ArrayBufferResource = ArrayBufferResource;
exports.AssetsResource = AssetsResource;
exports.BOTTOM = BOTTOM;
exports.BackgroundColorAnimation = BackgroundColorAnimation;

28
doric-js/bundle/doric-web.js
View File

@@ -74,12 +74,16 @@ function _wrappedValue(v) {
};
}
else if (v instanceof Array) {
v.forEach(e => {
traverse(e);
});
return {
type: "array",
value: JSON.stringify(v)
};
}
else {
traverse(v);
return {
type: "object",
value: JSON.stringify(v)
@@ -92,6 +96,30 @@ function _wrappedValue(v) {
};
}
}
const cachedArrayBuffer = new Map;
let bufferId = 0;
function traverse(obj) {
if (obj instanceof ArrayBuffer) {
return;
}
if (obj instanceof Array) {
obj.forEach(e => { traverse(e); });
return;
}
Object.entries(obj).forEach(([k, v]) => {
if (typeof v !== "object") {
return;
}
if (v instanceof ArrayBuffer) {
const id = `__buffer_${++bufferId}`;
obj[k] = `__buffer_${_arrayBufferToBase64(v)}`;
cachedArrayBuffer.set(id, v);
}
else {
traverse(v);
}
});
}
function _rawValue(v) {
switch (v.type) {
case "number":