@adviser/cement 0.4.28 → 0.4.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (69) hide show
  1. package/cjs/index.cjs +1 -0
  2. package/cjs/index.cjs.cjs +69 -0
  3. package/cjs/index.cjs.cjs.map +1 -0
  4. package/cjs/index.cjs.d.ts +30 -0
  5. package/cjs/index.cjs.d.ts.map +1 -0
  6. package/cjs/index.cjs.map +1 -1
  7. package/cjs/index.d.ts +1 -0
  8. package/cjs/index.d.ts.map +1 -1
  9. package/cjs/load-asset.cjs +27 -6
  10. package/cjs/load-asset.cjs.map +1 -1
  11. package/cjs/load-asset.d.ts +7 -3
  12. package/cjs/load-asset.d.ts.map +1 -1
  13. package/cjs/version.cjs +1 -1
  14. package/deno.json +1 -1
  15. package/esm/index.cjs.d.ts +30 -0
  16. package/esm/index.cjs.d.ts.map +1 -0
  17. package/esm/index.cjs.js +30 -0
  18. package/esm/index.cjs.js.map +1 -0
  19. package/esm/index.d.ts +1 -0
  20. package/esm/index.d.ts.map +1 -1
  21. package/esm/index.js +1 -0
  22. package/esm/index.js.map +1 -1
  23. package/esm/load-asset.d.ts +7 -3
  24. package/esm/load-asset.d.ts.map +1 -1
  25. package/esm/load-asset.js +26 -6
  26. package/esm/load-asset.js.map +1 -1
  27. package/esm/load-asset.test.js +15 -2
  28. package/esm/load-asset.test.js.map +1 -1
  29. package/esm/version.js +1 -1
  30. package/package.json +2 -2
  31. package/src/index.cjs.ts +34 -0
  32. package/src/index.ts +1 -0
  33. package/src/load-asset.ts +36 -9
  34. package/ts/cjs/index.cjs.d.ts +30 -0
  35. package/ts/cjs/index.cjs.d.ts.map +1 -0
  36. package/ts/cjs/index.cjs.js +69 -0
  37. package/ts/cjs/index.cjs.js.map +1 -0
  38. package/ts/cjs/index.d.ts +1 -0
  39. package/ts/cjs/index.d.ts.map +1 -1
  40. package/ts/cjs/index.js +1 -0
  41. package/ts/cjs/index.js.map +1 -1
  42. package/ts/cjs/load-asset.d.ts +7 -3
  43. package/ts/cjs/load-asset.d.ts.map +1 -1
  44. package/ts/cjs/load-asset.js +27 -6
  45. package/ts/cjs/load-asset.js.map +1 -1
  46. package/ts/cjs/version.js +1 -1
  47. package/ts/esm/index.cjs.d.ts +30 -0
  48. package/ts/esm/index.cjs.d.ts.map +1 -0
  49. package/ts/esm/index.cjs.js +30 -0
  50. package/ts/esm/index.cjs.js.map +1 -0
  51. package/ts/esm/index.d.ts +1 -0
  52. package/ts/esm/index.d.ts.map +1 -1
  53. package/ts/esm/index.js +1 -0
  54. package/ts/esm/index.js.map +1 -1
  55. package/ts/esm/load-asset.d.ts +7 -3
  56. package/ts/esm/load-asset.d.ts.map +1 -1
  57. package/ts/esm/load-asset.js +26 -6
  58. package/ts/esm/load-asset.js.map +1 -1
  59. package/ts/esm/load-asset.test.js +15 -2
  60. package/ts/esm/load-asset.test.js.map +1 -1
  61. package/ts/esm/version.js +1 -1
  62. package/cjs/load-asset.test.cjs +0 -31
  63. package/cjs/load-asset.test.cjs.map +0 -1
  64. package/cjs/load-asset.test.d.ts +0 -2
  65. package/cjs/load-asset.test.d.ts.map +0 -1
  66. package/ts/cjs/load-asset.test.d.ts +0 -2
  67. package/ts/cjs/load-asset.test.d.ts.map +0 -1
  68. package/ts/cjs/load-asset.test.js +0 -31
  69. package/ts/cjs/load-asset.test.js.map +0 -1
package/src/load-asset.ts CHANGED
@@ -20,34 +20,55 @@ async function callFsReadFile(mock?: Partial<MockLoadAsset>): Promise<MockLoadAs
20
20
  return (fname: string) => fs.promises.readFile(fname);
21
21
  }
22
22
 
23
- export interface LoadAssetOptions {
23
+ export interface LoadAssetOptionals {
24
24
  readonly fallBackUrl: CoerceURI;
25
25
  readonly pathCleaner: (base: string, localPath: string, mode: "fallback" | "normal") => string;
26
26
  readonly mock: Partial<MockLoadAsset>;
27
27
  }
28
28
 
29
- function fallBackBaseUrl(opts: Partial<LoadAssetOptions>): { url?: URL; src: "opts.fallBackUrl" } {
29
+ // basePath could fail throw
30
+ export type LoadAssetOpts = Partial<LoadAssetOptionals> & { readonly basePath: () => string };
31
+
32
+ function fallBackBaseUrl(opts: { fallBackUrl?: CoerceURI }): { url?: URL; src: "opts.fallBackUrl" } {
30
33
  return { url: opts.fallBackUrl ? URI.from(opts.fallBackUrl).asURL() : undefined, src: "opts.fallBackUrl" };
31
34
  }
32
35
 
33
- export async function loadAsset(localPath: string, opts: Partial<LoadAssetOptions> = {}): Promise<Result<string>> {
36
+ function baseUrlFromOpts(opts: LoadAssetOpts): URL | undefined {
37
+ try {
38
+ return urlDirname(opts.basePath()).asURL();
39
+ } catch (e) {
40
+ return;
41
+ }
42
+ }
43
+
44
+ export function urlDirname(url: CoerceURI): URI {
45
+ const uri = URI.from(url);
46
+ const buri = uri.build();
47
+ return buri.pathname(pathOps.dirname(uri.pathname)).URI();
48
+ }
49
+
50
+ export async function loadAsset(localPath: string, opts: LoadAssetOpts): Promise<Result<string>> {
51
+ const baseURL = baseUrlFromOpts(opts);
34
52
  const base: {
35
53
  url?: URL;
36
54
  src: "import.meta.url" | "opts.fallBackUrl";
37
- } = import.meta?.url ? { url: new URL(pathOps.dirname(import.meta.url)), src: "import.meta.url" } : fallBackBaseUrl(opts);
38
- return loadAssetReal(base, localPath, opts);
55
+ } = baseURL ? { url: baseURL, src: "import.meta.url" } : fallBackBaseUrl(opts);
56
+ return loadAssetReal(base, localPath, {
57
+ pathCleaner: (base, localPath) => pathOps.join(base, localPath),
58
+ ...opts,
59
+ });
39
60
  }
40
61
 
41
62
  async function loadAssetReal(
42
63
  baseUrl: { url?: URL; src: "import.meta.url" | "opts.fallBackUrl" },
43
64
  localPath: string,
44
- opts: Partial<LoadAssetOptions>,
65
+ opts: Partial<Omit<LoadAssetOpts, "pathCleaner">> & {
66
+ pathCleaner: (base: string, localPath: string, mode: "fallback" | "normal") => string;
67
+ },
45
68
  ): Promise<Result<string>> {
46
69
  if (!baseUrl.url) {
47
70
  return Result.Err(`base url not found from ${baseUrl.src}`);
48
71
  }
49
- const urlO = new URL(baseUrl.url.toString());
50
- urlO.pathname = pathOps.dirname(urlO.pathname);
51
72
  if (baseUrl.url.protocol.startsWith("file")) {
52
73
  const rt = runtimeFn();
53
74
  const fname = opts.pathCleaner(baseUrl.url.pathname, localPath, "normal");
@@ -80,7 +101,13 @@ async function loadAssetReal(
80
101
  baseUrl.url.pathname = opts.pathCleaner(baseUrl.url.pathname, localPath, "normal");
81
102
  break;
82
103
  }
83
- const rRes = await exception2Result(() => callFetch(opts.mock)(baseUrl.url));
104
+
105
+ const rRes = await exception2Result(() => {
106
+ if (!baseUrl.url) {
107
+ throw Error(`base url not found from ${baseUrl.src}`);
108
+ }
109
+ return callFetch(opts.mock)(baseUrl.url);
110
+ });
84
111
  if (rRes.isErr()) {
85
112
  if (baseUrl.src === "import.meta.url") {
86
113
  // eslint-disable-next-line no-console
@@ -0,0 +1,30 @@
1
+ export * from "./file-service.js";
2
+ export * from "./logger-impl.js";
3
+ export * from "./logger.js";
4
+ export * from "./sys-abstraction.js";
5
+ export * from "./sys-env.js";
6
+ export * from "./time.js";
7
+ export * from "./test/index.js";
8
+ export * from "./txt-en-decoder.js";
9
+ export * from "./log-level-impl.js";
10
+ export * from "./result.js";
11
+ export * from "./option.js";
12
+ export * from "./future.js";
13
+ export * from "./tracer.js";
14
+ export * from "./resolve-once.js";
15
+ export * from "./runtime.js";
16
+ export * from "./uri.js";
17
+ export * from "./crypto.js";
18
+ export * from "./base-sys-abstraction.js";
19
+ export * from "./bin2text.js";
20
+ export * from "./version.js";
21
+ export * from "./http_header.js";
22
+ export * from "./path-ops.js";
23
+ export * from "./json-en-decoder.js";
24
+ export * from "./types.js";
25
+ export * from "./lru-map-set.js";
26
+ export * from "./coerce-binary.js";
27
+ export * from "./is-promise.js";
28
+ export * from "./app-context.js";
29
+ export * as utils from "./utils/index.js";
30
+ //# sourceMappingURL=index.cjs.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.cjs.d.ts","sourceRoot":"","sources":["../../../src/index.cjs.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AAGjC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
@@ -0,0 +1,69 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
19
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
20
+ };
21
+ var __importStar = (this && this.__importStar) || (function () {
22
+ var ownKeys = function(o) {
23
+ ownKeys = Object.getOwnPropertyNames || function (o) {
24
+ var ar = [];
25
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
26
+ return ar;
27
+ };
28
+ return ownKeys(o);
29
+ };
30
+ return function (mod) {
31
+ if (mod && mod.__esModule) return mod;
32
+ var result = {};
33
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
34
+ __setModuleDefault(result, mod);
35
+ return result;
36
+ };
37
+ })();
38
+ Object.defineProperty(exports, "__esModule", { value: true });
39
+ exports.utils = void 0;
40
+ __exportStar(require("./file-service.js"), exports);
41
+ __exportStar(require("./logger-impl.js"), exports);
42
+ __exportStar(require("./logger.js"), exports);
43
+ __exportStar(require("./sys-abstraction.js"), exports);
44
+ __exportStar(require("./sys-env.js"), exports);
45
+ __exportStar(require("./time.js"), exports);
46
+ __exportStar(require("./test/index.js"), exports);
47
+ __exportStar(require("./txt-en-decoder.js"), exports);
48
+ __exportStar(require("./log-level-impl.js"), exports);
49
+ __exportStar(require("./result.js"), exports);
50
+ __exportStar(require("./option.js"), exports);
51
+ __exportStar(require("./future.js"), exports);
52
+ __exportStar(require("./tracer.js"), exports);
53
+ __exportStar(require("./resolve-once.js"), exports);
54
+ __exportStar(require("./runtime.js"), exports);
55
+ __exportStar(require("./uri.js"), exports);
56
+ __exportStar(require("./crypto.js"), exports);
57
+ __exportStar(require("./base-sys-abstraction.js"), exports);
58
+ __exportStar(require("./bin2text.js"), exports);
59
+ __exportStar(require("./version.js"), exports);
60
+ __exportStar(require("./http_header.js"), exports);
61
+ __exportStar(require("./path-ops.js"), exports);
62
+ __exportStar(require("./json-en-decoder.js"), exports);
63
+ __exportStar(require("./types.js"), exports);
64
+ __exportStar(require("./lru-map-set.js"), exports);
65
+ __exportStar(require("./coerce-binary.js"), exports);
66
+ __exportStar(require("./is-promise.js"), exports);
67
+ __exportStar(require("./app-context.js"), exports);
68
+ exports.utils = __importStar(require("./utils/index.js"));
69
+ //# sourceMappingURL=index.cjs.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.cjs.js","sourceRoot":"","sources":["../../../src/index.cjs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,mDAAiC;AACjC,8CAA4B;AAC5B,uDAAqC;AACrC,+CAA6B;AAC7B,4CAA0B;AAC1B,kDAAgC;AAChC,sDAAoC;AACpC,sDAAoC;AACpC,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,oDAAkC;AAClC,+CAA6B;AAC7B,2CAAyB;AACzB,8CAA4B;AAC5B,4DAA0C;AAC1C,gDAA8B;AAC9B,+CAA6B;AAC7B,mDAAiC;AACjC,gDAA8B;AAC9B,uDAAqC;AACrC,6CAA2B;AAC3B,mDAAiC;AACjC,qDAAmC;AACnC,kDAAgC;AAChC,mDAAiC;AAGjC,QAAY,KAAK,6CAAyB"}
package/ts/cjs/index.d.ts CHANGED
@@ -26,5 +26,6 @@ export * from "./lru-map-set.js";
26
26
  export * from "./coerce-binary.js";
27
27
  export * from "./is-promise.js";
28
28
  export * from "./app-context.js";
29
+ export * from "./load-asset.js";
29
30
  export * as utils from "./utils/index.js";
30
31
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AAGjC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAGhC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
package/ts/cjs/index.js CHANGED
@@ -65,5 +65,6 @@ __exportStar(require("./lru-map-set.js"), exports);
65
65
  __exportStar(require("./coerce-binary.js"), exports);
66
66
  __exportStar(require("./is-promise.js"), exports);
67
67
  __exportStar(require("./app-context.js"), exports);
68
+ __exportStar(require("./load-asset.js"), exports);
68
69
  exports.utils = __importStar(require("./utils/index.js"));
69
70
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,mDAAiC;AACjC,8CAA4B;AAC5B,uDAAqC;AACrC,+CAA6B;AAC7B,4CAA0B;AAC1B,kDAAgC;AAChC,sDAAoC;AACpC,sDAAoC;AACpC,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,oDAAkC;AAClC,+CAA6B;AAC7B,2CAAyB;AACzB,8CAA4B;AAC5B,4DAA0C;AAC1C,gDAA8B;AAC9B,+CAA6B;AAC7B,mDAAiC;AACjC,gDAA8B;AAC9B,uDAAqC;AACrC,6CAA2B;AAC3B,mDAAiC;AACjC,qDAAmC;AACnC,kDAAgC;AAChC,mDAAiC;AAGjC,QAAY,KAAK,6CAAyB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,mDAAiC;AACjC,8CAA4B;AAC5B,uDAAqC;AACrC,+CAA6B;AAC7B,4CAA0B;AAC1B,kDAAgC;AAChC,sDAAoC;AACpC,sDAAoC;AACpC,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,oDAAkC;AAClC,+CAA6B;AAC7B,2CAAyB;AACzB,8CAA4B;AAC5B,4DAA0C;AAC1C,gDAA8B;AAC9B,+CAA6B;AAC7B,mDAAiC;AACjC,gDAA8B;AAC9B,uDAAqC;AACrC,6CAA2B;AAC3B,mDAAiC;AACjC,qDAAmC;AACnC,kDAAgC;AAChC,mDAAiC;AACjC,kDAAgC;AAGhC,QAAY,KAAK,6CAAyB"}
@@ -1,14 +1,18 @@
1
1
  import { Result } from "./result.js";
2
- import { CoerceURI } from "./uri.js";
2
+ import { CoerceURI, URI } from "./uri.js";
3
3
  interface MockLoadAsset {
4
4
  fetch: typeof globalThis.fetch;
5
5
  fsReadFile: (fname: string) => Promise<Uint8Array>;
6
6
  }
7
- export interface LoadAssetOptions {
7
+ export interface LoadAssetOptionals {
8
8
  readonly fallBackUrl: CoerceURI;
9
9
  readonly pathCleaner: (base: string, localPath: string, mode: "fallback" | "normal") => string;
10
10
  readonly mock: Partial<MockLoadAsset>;
11
11
  }
12
- export declare function loadAsset(localPath: string, opts?: Partial<LoadAssetOptions>): Promise<Result<string>>;
12
+ export type LoadAssetOpts = Partial<LoadAssetOptionals> & {
13
+ readonly basePath: () => string;
14
+ };
15
+ export declare function urlDirname(url: CoerceURI): URI;
16
+ export declare function loadAsset(localPath: string, opts: LoadAssetOpts): Promise<Result<string>>;
13
17
  export {};
14
18
  //# sourceMappingURL=load-asset.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"load-asset.d.ts","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAO,MAAM,UAAU,CAAC;AAE1C,UAAU,aAAa;IACrB,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAC/B,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACpD;AAcD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,QAAQ,KAAK,MAAM,CAAC;IAC/F,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CACvC;AAMD,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,GAAE,OAAO,CAAC,gBAAgB,CAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAMhH"}
1
+ {"version":3,"file":"load-asset.d.ts","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAE1C,UAAU,aAAa;IACrB,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAC/B,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACpD;AAcD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,QAAQ,KAAK,MAAM,CAAC;IAC/F,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CACvC;AAGD,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,MAAM,CAAA;CAAE,CAAC;AAc9F,wBAAgB,UAAU,CAAC,GAAG,EAAE,SAAS,GAAG,GAAG,CAI9C;AAED,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAU/F"}
@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
33
33
  };
34
34
  })();
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
+ exports.urlDirname = urlDirname;
36
37
  exports.loadAsset = loadAsset;
37
38
  const path_ops_js_1 = require("./path-ops.js");
38
39
  const result_js_1 = require("./result.js");
@@ -51,16 +52,31 @@ async function callFsReadFile(mock) {
51
52
  function fallBackBaseUrl(opts) {
52
53
  return { url: opts.fallBackUrl ? uri_js_1.URI.from(opts.fallBackUrl).asURL() : undefined, src: "opts.fallBackUrl" };
53
54
  }
54
- async function loadAsset(localPath, opts = {}) {
55
- const base = import.meta?.url ? { url: new URL(path_ops_js_1.pathOps.dirname(import.meta.url)), src: "import.meta.url" } : fallBackBaseUrl(opts);
56
- return loadAssetReal(base, localPath, opts);
55
+ function baseUrlFromOpts(opts) {
56
+ try {
57
+ return urlDirname(opts.basePath()).asURL();
58
+ }
59
+ catch (e) {
60
+ return;
61
+ }
62
+ }
63
+ function urlDirname(url) {
64
+ const uri = uri_js_1.URI.from(url);
65
+ const buri = uri.build();
66
+ return buri.pathname(path_ops_js_1.pathOps.dirname(uri.pathname)).URI();
67
+ }
68
+ async function loadAsset(localPath, opts) {
69
+ const baseURL = baseUrlFromOpts(opts);
70
+ const base = baseURL ? { url: baseURL, src: "import.meta.url" } : fallBackBaseUrl(opts);
71
+ return loadAssetReal(base, localPath, {
72
+ pathCleaner: (base, localPath) => path_ops_js_1.pathOps.join(base, localPath),
73
+ ...opts,
74
+ });
57
75
  }
58
76
  async function loadAssetReal(baseUrl, localPath, opts) {
59
77
  if (!baseUrl.url) {
60
78
  return result_js_1.Result.Err(`base url not found from ${baseUrl.src}`);
61
79
  }
62
- const urlO = new URL(baseUrl.url.toString());
63
- urlO.pathname = path_ops_js_1.pathOps.dirname(urlO.pathname);
64
80
  if (baseUrl.url.protocol.startsWith("file")) {
65
81
  const rt = (0, runtime_js_1.runtimeFn)();
66
82
  const fname = opts.pathCleaner(baseUrl.url.pathname, localPath, "normal");
@@ -87,7 +103,12 @@ async function loadAssetReal(baseUrl, localPath, opts) {
87
103
  baseUrl.url.pathname = opts.pathCleaner(baseUrl.url.pathname, localPath, "normal");
88
104
  break;
89
105
  }
90
- const rRes = await (0, result_js_1.exception2Result)(() => callFetch(opts.mock)(baseUrl.url));
106
+ const rRes = await (0, result_js_1.exception2Result)(() => {
107
+ if (!baseUrl.url) {
108
+ throw Error(`base url not found from ${baseUrl.src}`);
109
+ }
110
+ return callFetch(opts.mock)(baseUrl.url);
111
+ });
91
112
  if (rRes.isErr()) {
92
113
  if (baseUrl.src === "import.meta.url") {
93
114
  console.warn(`fetch failed for: ${baseUrl.url}`);
@@ -1 +1 @@
1
- {"version":3,"file":"load-asset.js","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"load-asset.js","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"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"}
package/ts/cjs/version.js CHANGED
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.VERSION = void 0;
4
- exports.VERSION = "0.4.28";
4
+ exports.VERSION = "0.4.30";
5
5
  //# sourceMappingURL=version.js.map
@@ -0,0 +1,30 @@
1
+ export * from "./file-service.js";
2
+ export * from "./logger-impl.js";
3
+ export * from "./logger.js";
4
+ export * from "./sys-abstraction.js";
5
+ export * from "./sys-env.js";
6
+ export * from "./time.js";
7
+ export * from "./test/index.js";
8
+ export * from "./txt-en-decoder.js";
9
+ export * from "./log-level-impl.js";
10
+ export * from "./result.js";
11
+ export * from "./option.js";
12
+ export * from "./future.js";
13
+ export * from "./tracer.js";
14
+ export * from "./resolve-once.js";
15
+ export * from "./runtime.js";
16
+ export * from "./uri.js";
17
+ export * from "./crypto.js";
18
+ export * from "./base-sys-abstraction.js";
19
+ export * from "./bin2text.js";
20
+ export * from "./version.js";
21
+ export * from "./http_header.js";
22
+ export * from "./path-ops.js";
23
+ export * from "./json-en-decoder.js";
24
+ export * from "./types.js";
25
+ export * from "./lru-map-set.js";
26
+ export * from "./coerce-binary.js";
27
+ export * from "./is-promise.js";
28
+ export * from "./app-context.js";
29
+ export * as utils from "./utils/index.js";
30
+ //# sourceMappingURL=index.cjs.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.cjs.d.ts","sourceRoot":"","sources":["../../../src/index.cjs.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AAGjC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
@@ -0,0 +1,30 @@
1
+ export * from "./file-service.js";
2
+ export * from "./logger-impl.js";
3
+ export * from "./logger.js";
4
+ export * from "./sys-abstraction.js";
5
+ export * from "./sys-env.js";
6
+ export * from "./time.js";
7
+ export * from "./test/index.js";
8
+ export * from "./txt-en-decoder.js";
9
+ export * from "./log-level-impl.js";
10
+ export * from "./result.js";
11
+ export * from "./option.js";
12
+ export * from "./future.js";
13
+ export * from "./tracer.js";
14
+ export * from "./resolve-once.js";
15
+ export * from "./runtime.js";
16
+ export * from "./uri.js";
17
+ export * from "./crypto.js";
18
+ export * from "./base-sys-abstraction.js";
19
+ export * from "./bin2text.js";
20
+ export * from "./version.js";
21
+ export * from "./http_header.js";
22
+ export * from "./path-ops.js";
23
+ export * from "./json-en-decoder.js";
24
+ export * from "./types.js";
25
+ export * from "./lru-map-set.js";
26
+ export * from "./coerce-binary.js";
27
+ export * from "./is-promise.js";
28
+ export * from "./app-context.js";
29
+ export * as utils from "./utils/index.js";
30
+ //# sourceMappingURL=index.cjs.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.cjs.js","sourceRoot":"","sources":["../../../src/index.cjs.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AAGjC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
package/ts/esm/index.d.ts CHANGED
@@ -26,5 +26,6 @@ export * from "./lru-map-set.js";
26
26
  export * from "./coerce-binary.js";
27
27
  export * from "./is-promise.js";
28
28
  export * from "./app-context.js";
29
+ export * from "./load-asset.js";
29
30
  export * as utils from "./utils/index.js";
30
31
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AAGjC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAGhC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
package/ts/esm/index.js CHANGED
@@ -26,5 +26,6 @@ export * from "./lru-map-set.js";
26
26
  export * from "./coerce-binary.js";
27
27
  export * from "./is-promise.js";
28
28
  export * from "./app-context.js";
29
+ export * from "./load-asset.js";
29
30
  export * as utils from "./utils/index.js";
30
31
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AAGjC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAGhC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
@@ -1,14 +1,18 @@
1
1
  import { Result } from "./result.js";
2
- import { CoerceURI } from "./uri.js";
2
+ import { CoerceURI, URI } from "./uri.js";
3
3
  interface MockLoadAsset {
4
4
  fetch: typeof globalThis.fetch;
5
5
  fsReadFile: (fname: string) => Promise<Uint8Array>;
6
6
  }
7
- export interface LoadAssetOptions {
7
+ export interface LoadAssetOptionals {
8
8
  readonly fallBackUrl: CoerceURI;
9
9
  readonly pathCleaner: (base: string, localPath: string, mode: "fallback" | "normal") => string;
10
10
  readonly mock: Partial<MockLoadAsset>;
11
11
  }
12
- export declare function loadAsset(localPath: string, opts?: Partial<LoadAssetOptions>): Promise<Result<string>>;
12
+ export type LoadAssetOpts = Partial<LoadAssetOptionals> & {
13
+ readonly basePath: () => string;
14
+ };
15
+ export declare function urlDirname(url: CoerceURI): URI;
16
+ export declare function loadAsset(localPath: string, opts: LoadAssetOpts): Promise<Result<string>>;
13
17
  export {};
14
18
  //# sourceMappingURL=load-asset.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"load-asset.d.ts","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAO,MAAM,UAAU,CAAC;AAE1C,UAAU,aAAa;IACrB,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAC/B,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACpD;AAcD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,QAAQ,KAAK,MAAM,CAAC;IAC/F,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CACvC;AAMD,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,GAAE,OAAO,CAAC,gBAAgB,CAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAMhH"}
1
+ {"version":3,"file":"load-asset.d.ts","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAE1C,UAAU,aAAa;IACrB,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAC/B,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACpD;AAcD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,QAAQ,KAAK,MAAM,CAAC;IAC/F,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CACvC;AAGD,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,MAAM,CAAA;CAAE,CAAC;AAc9F,wBAAgB,UAAU,CAAC,GAAG,EAAE,SAAS,GAAG,GAAG,CAI9C;AAED,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAU/F"}
@@ -15,16 +15,31 @@ async function callFsReadFile(mock) {
15
15
  function fallBackBaseUrl(opts) {
16
16
  return { url: opts.fallBackUrl ? URI.from(opts.fallBackUrl).asURL() : undefined, src: "opts.fallBackUrl" };
17
17
  }
18
- export async function loadAsset(localPath, opts = {}) {
19
- const base = import.meta?.url ? { url: new URL(pathOps.dirname(import.meta.url)), src: "import.meta.url" } : fallBackBaseUrl(opts);
20
- return loadAssetReal(base, localPath, opts);
18
+ function baseUrlFromOpts(opts) {
19
+ try {
20
+ return urlDirname(opts.basePath()).asURL();
21
+ }
22
+ catch (e) {
23
+ return;
24
+ }
25
+ }
26
+ export function urlDirname(url) {
27
+ const uri = URI.from(url);
28
+ const buri = uri.build();
29
+ return buri.pathname(pathOps.dirname(uri.pathname)).URI();
30
+ }
31
+ export async function loadAsset(localPath, opts) {
32
+ const baseURL = baseUrlFromOpts(opts);
33
+ const base = baseURL ? { url: baseURL, src: "import.meta.url" } : fallBackBaseUrl(opts);
34
+ return loadAssetReal(base, localPath, {
35
+ pathCleaner: (base, localPath) => pathOps.join(base, localPath),
36
+ ...opts,
37
+ });
21
38
  }
22
39
  async function loadAssetReal(baseUrl, localPath, opts) {
23
40
  if (!baseUrl.url) {
24
41
  return Result.Err(`base url not found from ${baseUrl.src}`);
25
42
  }
26
- const urlO = new URL(baseUrl.url.toString());
27
- urlO.pathname = pathOps.dirname(urlO.pathname);
28
43
  if (baseUrl.url.protocol.startsWith("file")) {
29
44
  const rt = runtimeFn();
30
45
  const fname = opts.pathCleaner(baseUrl.url.pathname, localPath, "normal");
@@ -51,7 +66,12 @@ async function loadAssetReal(baseUrl, localPath, opts) {
51
66
  baseUrl.url.pathname = opts.pathCleaner(baseUrl.url.pathname, localPath, "normal");
52
67
  break;
53
68
  }
54
- const rRes = await exception2Result(() => callFetch(opts.mock)(baseUrl.url));
69
+ const rRes = await exception2Result(() => {
70
+ if (!baseUrl.url) {
71
+ throw Error(`base url not found from ${baseUrl.src}`);
72
+ }
73
+ return callFetch(opts.mock)(baseUrl.url);
74
+ });
55
75
  if (rRes.isErr()) {
56
76
  if (baseUrl.src === "import.meta.url") {
57
77
  console.warn(`fetch failed for: ${baseUrl.url}`);
@@ -1 +1 @@
1
- {"version":3,"file":"load-asset.js","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"load-asset.js","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { describe, it, expect } from "vitest";
2
- import { loadAsset } from "./load-asset.js";
2
+ import { loadAsset, urlDirname } from "./load-asset.js";
3
3
  import { runtimeFn } from "./runtime.js";
4
4
  describe("loadAsset", () => {
5
5
  if (!runtimeFn().isCFWorker) {
@@ -7,14 +7,27 @@ describe("loadAsset", () => {
7
7
  const result = await loadAsset("version.ts", {
8
8
  fallBackUrl: "not://working/x",
9
9
  pathCleaner: (base, localPath) => `${base}/./${localPath}`,
10
+ basePath: () => import.meta.url,
10
11
  });
11
12
  expect(result.isOk()).toBe(true);
12
13
  expect(result.Ok()).toContain("VERSION");
13
14
  });
14
15
  it("returns file content from fallback", async () => {
15
16
  const result = await loadAsset("version.ts", {
16
- fallBackUrl: runtimeFn().isBrowser ? import.meta.url : "file://./",
17
+ fallBackUrl: urlDirname(import.meta.url),
17
18
  pathCleaner: (base, localPath) => `${base}/${localPath}`,
19
+ basePath: () => "kaput",
20
+ });
21
+ expect(result.isOk()).toBe(true);
22
+ expect(result.Ok()).toContain("VERSION");
23
+ });
24
+ it("failed basePath", async () => {
25
+ const result = await loadAsset("version.ts", {
26
+ fallBackUrl: urlDirname(import.meta.url),
27
+ pathCleaner: (base, localPath) => `${base}/${localPath}`,
28
+ basePath: () => {
29
+ throw new Error("failed basePath");
30
+ },
18
31
  });
19
32
  expect(result.isOk()).toBe(true);
20
33
  expect(result.Ok()).toContain("VERSION");
@@ -1 +1 @@
1
- {"version":3,"file":"load-asset.test.js","sourceRoot":"","sources":["../../../src/load-asset.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC;IAC1B,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC;QAC5B,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE;gBAC3C,WAAW,EAAE,iBAAiB;gBAC9B,WAAW,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,IAAI,MAAM,SAAS,EAAE;aAC3D,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAAA,CAC1C,CAAC,CAAC;QACH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE;gBAC3C,WAAW,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW;gBAClE,WAAW,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,SAAS,EAAE;aACzD,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAAA,CAC1C,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,CAAC;QAAA,CACd,CAAC,CAAC;IACL,CAAC;AAAA,CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"load-asset.test.js","sourceRoot":"","sources":["../../../src/load-asset.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC;IAC1B,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC;QAC5B,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE;gBAC3C,WAAW,EAAE,iBAAiB;gBAC9B,WAAW,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,IAAI,MAAM,SAAS,EAAE;gBAC1D,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,IAAI,CAAC,GAAG;aAChC,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAAA,CAC1C,CAAC,CAAC;QACH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE;gBAC3C,WAAW,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC;gBACxC,WAAW,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,SAAS,EAAE;gBACxD,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO;aACxB,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAAA,CAC1C,CAAC,CAAC;QACH,EAAE,CAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE;gBAC3C,WAAW,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC;gBACxC,WAAW,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,SAAS,EAAE;gBACxD,QAAQ,EAAE,GAAG,EAAE,CAAC;oBACd,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBAAA,CACpC;aACF,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAAA,CAC1C,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,CAAC;QAAA,CACd,CAAC,CAAC;IACL,CAAC;AAAA,CACF,CAAC,CAAC"}
package/ts/esm/version.js CHANGED
@@ -1,2 +1,2 @@
1
- export const VERSION = "0.4.28";
1
+ export const VERSION = "0.4.30";
2
2
  //# sourceMappingURL=version.js.map