vona-module-a-static 5.0.19 → 5.0.22

package/cli/asset/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -0,0 +1,7 @@
+import { Meta } from 'vona-module-a-meta';
+import { BeanAssetBase } from 'vona-module-a-static';
+
+export interface I<%=argv.beanNameCapitalize%>GetPath {}
+
+@Meta()
+export class Meta<%=argv.beanNameCapitalize%> extends BeanAssetBase<I<%=argv.beanNameCapitalize%>GetPath> {}

package/cli/{boilerplate → static/boilerplate}/{{sceneName}}.{{beanName}}.ts_

@@ -1,9 +1,7 @@
 import { Meta } from 'vona-module-a-meta';
 import { BeanStaticBase } from 'vona-module-a-static';
 
-export interface Meta<%=argv.beanNameCapitalize%> {
-  get(path: 'path'): string;
-}
+export type Type<%=argv.beanNameCapitalize%>GetPath = never;
 
 @Meta()
-export class Meta<%=argv.beanNameCapitalize%> extends BeanStaticBase {}
+export class Meta<%=argv.beanNameCapitalize%> extends BeanStaticBase<Type<%=argv.beanNameCapitalize%>GetPath> {}

package/dist/index.js

@@ -118,7 +118,7 @@ async function _getFullPathInner(ctx, dir, filename, options) {
   // trim prefix
   if (options.apiStaticPrefix !== '/') {
     const filePrefix = path.normalize(options.apiStaticPrefix.replace(/^\//, ''));
-    if (filename.indexOf(filePrefix) !== 0) return;
+    if (filename.indexOf(filePrefix) !== 0) throw new Error(`invalid filename: ${filename}`);
     filename = filename.slice(filePrefix.length);
   }
   // check
@@ -128,13 +128,13 @@ async function _getFullPathInner(ctx, dir, filename, options) {
   if (wordFirst === 'public') {
     const fullPath = path.normalize(path.join(dir, parts.join(path.sep)));
     // files that can be accessd should be under options.dir
-    if (fullPath.indexOf(dir) !== 0) return;
+    if (fullPath.indexOf(dir) !== 0) throw new Error(`unsafe filename: ${filename}`);
     return fullPath;
   }
   // static
   const moduleRelativeName = `${wordFirst}-${parts.shift()}`;
   const module = ctx.app.meta.modules[moduleRelativeName];
-  if (!module) return;
+  if (!module) throw new Error(`invalid filename: ${filename}`);
   const fullPath = ctx.app.util.getAssetPathPhysical(moduleRelativeName, 'static', parts.join(path.sep));
   return fullPath;
 }
@@ -151,14 +151,16 @@ let ScopeModuleAStatic = (_dec = Scope(), _dec2 = BeanInfo({
 
 /** scope: end */
 
+class BeanAssetBase extends BeanBase {
+  get(scene, assetPath) {
+    return this.app.util.getAssetPathPhysical(this[SymbolModuleBelong], scene, assetPath);
+  }
+}
+
 class BeanStaticBase extends BeanBase {
-  __get__(prop) {
-    if (prop === 'get') {
-      return path => {
-        return this.app.util.combineStaticPath(path, this[SymbolModuleBelong]);
-      };
-    }
+  get(path) {
+    return this.app.util.combineStaticPath(path, this[SymbolModuleBelong]);
   }
 }
 
-export { BeanStaticBase, EventResolvePath, MiddlewareSystemStatic, ScopeModuleAStatic, SymbolStaticGetFullPathInner };
+export { BeanAssetBase, BeanStaticBase, EventResolvePath, MiddlewareSystemStatic, ScopeModuleAStatic, SymbolStaticGetFullPathInner };

package/dist/lib/beanAssetBase.d.ts

@@ -0,0 +1,4 @@
+import { BeanBase } from 'vona';
+export declare class BeanAssetBase<IAssetGetPath> extends BeanBase {
+    get<K extends keyof IAssetGetPath, V extends IAssetGetPath[K]>(scene: K, assetPath: V): string;
+}

package/dist/lib/beanStaticBase.d.ts

@@ -1,4 +1,4 @@
 import { BeanBase } from 'vona';
-export declare class BeanStaticBase extends BeanBase {
-    protected __get__(prop: string): ((path: string) => string) | undefined;
+export declare class BeanStaticBase<TypeStaticGetPath> extends BeanBase {
+    get(path: TypeStaticGetPath): string;
 }

package/dist/lib/index.d.ts

@@ -1 +1,2 @@
+export * from './beanAssetBase.ts';
 export * from './beanStaticBase.ts';

package/package.json

@@ -1,14 +1,18 @@
 {
   "name": "vona-module-a-static",
   "type": "module",
-  "version": "5.0.19",
+  "version": "5.0.22",
   "title": "a-static",
   "vonaModule": {
     "dependencies": {},
     "metas": {
       "static": {
         "scopeResource": true,
-        "boilerplate": "cli/boilerplate"
+        "boilerplate": "cli/static/boilerplate"
+      },
+      "asset": {
+        "scopeResource": true,
+        "boilerplate": "cli/asset/boilerplate"
       }
     }
   },