feat: add DoricAssets resource

2021-12-07 18:38:05 +08:00
parent 233f31b90b
commit 1ba4336857
17 changed files with 279 additions and 62 deletions
--- a/doric-js/bundle/doric-lib.es5.js
+++ b/doric-js/bundle/doric-lib.es5.js
@@ -2177,6 +2177,30 @@ var Base64Resource = /** @class */ (function (_super) {
    }
    return Base64Resource;
 }(Resource));
+/**
+ * Resources belong to assets dir.
+ */
+var DoricAssetsResource = /** @class */ (function (_super) {
+    __extends$f(DoricAssetsResource, _super);
+    function DoricAssetsResource(content) {
+        return _super.call(this, "doric_assets", content) || this;
+    }
+    return DoricAssetsResource;
+}(Resource));
+var AndroidResource = /** @class */ (function (_super) {
+    __extends$f(AndroidResource, _super);
+    function AndroidResource() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return AndroidResource;
+}(Resource));
+var iOSResource = /** @class */ (function (_super) {
+    __extends$f(iOSResource, _super);
+    function iOSResource() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return iOSResource;
+}(Resource));
 /**
 * This is for android platform
 */
@@ -2186,21 +2210,21 @@ var DrawableResource = /** @class */ (function (_super) {
        return _super.call(this, "drawable", name) || this;
    }
    return DrawableResource;
-}(Resource));
+}(AndroidResource));
 var RawResource = /** @class */ (function (_super) {
    __extends$f(RawResource, _super);
    function RawResource(name) {
        return _super.call(this, "raw", name) || this;
    }
    return RawResource;
-}(Resource));
-var AssetResource = /** @class */ (function (_super) {
-    __extends$f(AssetResource, _super);
-    function AssetResource(path) {
-        return _super.call(this, "assets", path) || this;
+}(AndroidResource));
+var AndroidAssetsResource = /** @class */ (function (_super) {
+    __extends$f(AndroidAssetsResource, _super);
+    function AndroidAssetsResource(path) {
+        return _super.call(this, "android_assets", path) || this;
    }
-    return AssetResource;
-}(Resource));
+    return AndroidAssetsResource;
+}(AndroidResource));
 /**
 * This is for iOS platform
 */
@@ -2210,14 +2234,14 @@ var MainBundleResource = /** @class */ (function (_super) {
        return _super.call(this, "mainBundle", fileName) || this;
    }
    return MainBundleResource;
-}(Resource));
+}(iOSResource));
 var BundleResource = /** @class */ (function (_super) {
    __extends$f(BundleResource, _super);
    function BundleResource(bundleName, fileName) {
        return _super.call(this, "bundle", bundleName + "://" + fileName) || this;
    }
    return BundleResource;
-}(Resource));
+}(iOSResource));

 var __extends$e = (undefined && undefined.__extends) || (function () {
    var extendStatics = function (d, b) {
@@ -4498,8 +4522,9 @@ var ModularPanel = /** @class */ (function (_super) {

 exports.AeroEffect = AeroEffect;
 exports.AlphaAnimation = AlphaAnimation;
+exports.AndroidAssetsResource = AndroidAssetsResource;
+exports.AndroidResource = AndroidResource;
 exports.AnimationSet = AnimationSet;
-exports.AssetResource = AssetResource;
 exports.BOTTOM = BOTTOM;
 exports.BackgroundColorAnimation = BackgroundColorAnimation;
 exports.Base64Resource = Base64Resource;
@@ -4509,6 +4534,7 @@ exports.CENTER = CENTER;
 exports.CENTER_X = CENTER_X;
 exports.CENTER_Y = CENTER_Y;
 exports.Color = Color;
+exports.DoricAssetsResource = DoricAssetsResource;
 exports.Draggable = Draggable;
 exports.DrawableResource = DrawableResource;
 exports.FlexLayout = FlexLayout;
@@ -4576,6 +4602,7 @@ exports.flowlayout = flowlayout;
 exports.gestureContainer = gestureContainer;
 exports.gravity = gravity;
 exports.hlayout = hlayout;
+exports.iOSResource = iOSResource;
 exports.image = image;
 exports.input = input;
 exports.internalScheme = internalScheme;
--- a/doric-js/bundle/doric-lib.js
+++ b/doric-js/bundle/doric-lib.js
@@ -1635,33 +1635,45 @@ class Base64Resource extends Resource {
        super("base64", content);
    }
 }
+/**
+ * Resources belong to assets dir.
+ */
+class DoricAssetsResource extends Resource {
+    constructor(content) {
+        super("doric_assets", content);
+    }
+}
+class AndroidResource extends Resource {
+}
+class iOSResource extends Resource {
+}
 /**
 * This is for android platform
 */
-class DrawableResource extends Resource {
+class DrawableResource extends AndroidResource {
    constructor(name) {
        super("drawable", name);
    }
 }
-class RawResource extends Resource {
+class RawResource extends AndroidResource {
    constructor(name) {
        super("raw", name);
    }
 }
-class AssetResource extends Resource {
+class AndroidAssetsResource extends AndroidResource {
    constructor(path) {
-        super("assets", path);
+        super("android_assets", path);
    }
 }
 /**
 * This is for iOS platform
 */
-class MainBundleResource extends Resource {
+class MainBundleResource extends iOSResource {
    constructor(fileName) {
        super("mainBundle", fileName);
    }
 }
-class BundleResource extends Resource {
+class BundleResource extends iOSResource {
    constructor(bundleName, fileName) {
        super("bundle", `${bundleName}://${fileName}`);
    }
@@ -3441,8 +3453,9 @@ class ModularPanel extends Module {

 exports.AeroEffect = AeroEffect;
 exports.AlphaAnimation = AlphaAnimation;
+exports.AndroidAssetsResource = AndroidAssetsResource;
+exports.AndroidResource = AndroidResource;
 exports.AnimationSet = AnimationSet;
-exports.AssetResource = AssetResource;
 exports.BOTTOM = BOTTOM;
 exports.BackgroundColorAnimation = BackgroundColorAnimation;
 exports.Base64Resource = Base64Resource;
@@ -3452,6 +3465,7 @@ exports.CENTER = CENTER;
 exports.CENTER_X = CENTER_X;
 exports.CENTER_Y = CENTER_Y;
 exports.Color = Color;
+exports.DoricAssetsResource = DoricAssetsResource;
 exports.Draggable = Draggable;
 exports.DrawableResource = DrawableResource;
 exports.FlexLayout = FlexLayout;
@@ -3519,6 +3533,7 @@ exports.flowlayout = flowlayout;
 exports.gestureContainer = gestureContainer;
 exports.gravity = gravity;
 exports.hlayout = hlayout;
+exports.iOSResource = iOSResource;
 exports.image = image;
 exports.input = input;
 exports.internalScheme = internalScheme;
--- a/doric-js/bundle/doric-vm.js
+++ b/doric-js/bundle/doric-vm.js
@@ -3163,33 +3163,45 @@ class Base64Resource extends Resource {
        super("base64", content);
    }
 }
+/**
+ * Resources belong to assets dir.
+ */
+class DoricAssetsResource extends Resource {
+    constructor(content) {
+        super("doric_assets", content);
+    }
+}
+class AndroidResource extends Resource {
+}
+class iOSResource extends Resource {
+}
 /**
 * This is for android platform
 */
-class DrawableResource extends Resource {
+class DrawableResource extends AndroidResource {
    constructor(name) {
        super("drawable", name);
    }
 }
-class RawResource extends Resource {
+class RawResource extends AndroidResource {
    constructor(name) {
        super("raw", name);
    }
 }
-class AssetResource extends Resource {
+class AndroidAssetsResource extends AndroidResource {
    constructor(path) {
-        super("assets", path);
+        super("android_assets", path);
    }
 }
 /**
 * This is for iOS platform
 */
-class MainBundleResource extends Resource {
+class MainBundleResource extends iOSResource {
    constructor(fileName) {
        super("mainBundle", fileName);
    }
 }
-class BundleResource extends Resource {
+class BundleResource extends iOSResource {
    constructor(bundleName, fileName) {
        super("bundle", `${bundleName}://${fileName}`);
    }
@@ -5210,8 +5222,9 @@ global$1.nativeEmpty = () => {

 exports.AeroEffect = AeroEffect;
 exports.AlphaAnimation = AlphaAnimation;
+exports.AndroidAssetsResource = AndroidAssetsResource;
+exports.AndroidResource = AndroidResource;
 exports.AnimationSet = AnimationSet;
-exports.AssetResource = AssetResource;
 exports.BOTTOM = BOTTOM;
 exports.BackgroundColorAnimation = BackgroundColorAnimation;
 exports.Base64Resource = Base64Resource;
@@ -5221,6 +5234,7 @@ exports.CENTER = CENTER;
 exports.CENTER_X = CENTER_X;
 exports.CENTER_Y = CENTER_Y;
 exports.Color = Color;
+exports.DoricAssetsResource = DoricAssetsResource;
 exports.Draggable = Draggable;
 exports.DrawableResource = DrawableResource;
 exports.FlexLayout = FlexLayout;
@@ -5288,6 +5302,7 @@ exports.flowlayout = flowlayout;
 exports.gestureContainer = gestureContainer;
 exports.gravity = gravity;
 exports.hlayout = hlayout;
+exports.iOSResource = iOSResource;
 exports.image = image;
 exports.input = input;
 exports.internalScheme = internalScheme;
--- a/doric-js/index.d.ts
+++ b/doric-js/index.d.ts
@@ -1690,25 +1690,35 @@ declare module 'doric/lib/src/util/resource' {
    export class Base64Resource extends Resource {
            constructor(content: string);
    }
+    /**
+        * Resources belong to assets dir.
+        */
+    export class DoricAssetsResource extends Resource {
+            constructor(content: string);
+    }
+    export class AndroidResource extends Resource {
+    }
+    export class iOSResource extends Resource {
+    }
    /**
        * This is for android platform
        */
-    export class DrawableResource extends Resource {
+    export class DrawableResource extends AndroidResource {
            constructor(name: string);
    }
-    export class RawResource extends Resource {
+    export class RawResource extends AndroidResource {
            constructor(name: string);
    }
-    export class AssetResource extends Resource {
+    export class AndroidAssetsResource extends AndroidResource {
            constructor(path: string);
    }
    /**
        * This is for iOS platform
        */
-    export class MainBundleResource extends Resource {
+    export class MainBundleResource extends iOSResource {
            constructor(fileName: string);
    }
-    export class BundleResource extends Resource {
+    export class BundleResource extends iOSResource {
            constructor(bundleName: string, fileName: string);
    }
 }
--- a/doric-js/lib/src/util/resource.d.ts
+++ b/doric-js/lib/src/util/resource.d.ts
@@ -17,24 +17,34 @@ export declare class RemoteResource extends Resource {
 export declare class Base64Resource extends Resource {
    constructor(content: string);
 }
+/**
+ * Resources belong to assets dir.
+ */
+export declare class DoricAssetsResource extends Resource {
+    constructor(content: string);
+}
+export declare class AndroidResource extends Resource {
+}
+export declare class iOSResource extends Resource {
+}
 /**
 * This is for android platform
 */
-export declare class DrawableResource extends Resource {
+export declare class DrawableResource extends AndroidResource {
    constructor(name: string);
 }
-export declare class RawResource extends Resource {
+export declare class RawResource extends AndroidResource {
    constructor(name: string);
 }
-export declare class AssetResource extends Resource {
+export declare class AndroidAssetsResource extends AndroidResource {
    constructor(path: string);
 }
 /**
 * This is for iOS platform
 */
-export declare class MainBundleResource extends Resource {
+export declare class MainBundleResource extends iOSResource {
    constructor(fileName: string);
 }
-export declare class BundleResource extends Resource {
+export declare class BundleResource extends iOSResource {
    constructor(bundleName: string, fileName: string);
 }
--- a/doric-js/lib/src/util/resource.js
+++ b/doric-js/lib/src/util/resource.js
@@ -25,33 +25,45 @@ export class Base64Resource extends Resource {
        super("base64", content);
    }
 }
+/**
+ * Resources belong to assets dir.
+ */
+export class DoricAssetsResource extends Resource {
+    constructor(content) {
+        super("doric_assets", content);
+    }
+}
+export class AndroidResource extends Resource {
+}
+export class iOSResource extends Resource {
+}
 /**
 * This is for android platform
 */
-export class DrawableResource extends Resource {
+export class DrawableResource extends AndroidResource {
    constructor(name) {
        super("drawable", name);
    }
 }
-export class RawResource extends Resource {
+export class RawResource extends AndroidResource {
    constructor(name) {
        super("raw", name);
    }
 }
-export class AssetResource extends Resource {
+export class AndroidAssetsResource extends AndroidResource {
    constructor(path) {
-        super("assets", path);
+        super("android_assets", path);
    }
 }
 /**
 * This is for iOS platform
 */
-export class MainBundleResource extends Resource {
+export class MainBundleResource extends iOSResource {
    constructor(fileName) {
        super("mainBundle", fileName);
    }
 }
-export class BundleResource extends Resource {
+export class BundleResource extends iOSResource {
    constructor(bundleName, fileName) {
        super("bundle", `${bundleName}://${fileName}`);
    }
--- a/doric-js/src/util/resource.ts
+++ b/doric-js/src/util/resource.ts
@@ -32,38 +32,50 @@ export class Base64Resource extends Resource {
        super("base64", content)
    }
 }
+/**
+ * Resources belong to assets dir.
+ */
+export class DoricAssetsResource extends Resource {
+    constructor(content: string) {
+        super("doric_assets", content)
+    }
+}

+export class AndroidResource extends Resource {
+}
+export class iOSResource extends Resource {
+}
 /**
 * This is for android platform
 */
-export class DrawableResource extends Resource {
+export class DrawableResource extends AndroidResource {
    constructor(name: string) {
        super("drawable", name)
    }
 }

-export class RawResource extends Resource {
+export class RawResource extends AndroidResource {
    constructor(name: string) {
        super("raw", name)
    }
 }

-export class AssetResource extends Resource {
+export class AndroidAssetsResource extends AndroidResource {
    constructor(path: string) {
-        super("assets", path)
+        super("android_assets", path)
    }
 }

 /**
 * This is for iOS platform
 */
-export class MainBundleResource extends Resource {
+export class MainBundleResource extends iOSResource {
    constructor(fileName: string) {
        super("mainBundle", fileName)
    }
 }

-export class BundleResource extends Resource {
+export class BundleResource extends iOSResource {
    constructor(bundleName: string, fileName: string) {
        super("bundle", `${bundleName}://${fileName}`)
    }