@napi-rs/cli 3.0.0-alpha.4 → 3.0.0-alpha.6

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 (135) hide show
  1. package/cli.mjs +0 -0
  2. package/dist/api/artifacts.js +5 -2
  3. package/dist/api/artifacts.js.map +1 -0
  4. package/dist/api/build.d.ts +1 -1
  5. package/dist/api/build.js +98 -27
  6. package/dist/api/build.js.map +1 -0
  7. package/dist/api/create-npm-dirs.js +1 -0
  8. package/dist/api/create-npm-dirs.js.map +1 -0
  9. package/dist/api/load-wasi-template.d.ts +1 -0
  10. package/dist/api/load-wasi-template.js +63 -0
  11. package/dist/api/load-wasi-template.js.map +1 -0
  12. package/dist/api/new.js +2 -1
  13. package/dist/api/new.js.map +1 -0
  14. package/dist/api/pre-publish.js +1 -0
  15. package/dist/api/pre-publish.js.map +1 -0
  16. package/dist/api/rename.js +1 -0
  17. package/dist/api/rename.js.map +1 -0
  18. package/dist/api/templates/.gitignore.d.ts +1 -1
  19. package/dist/api/templates/.gitignore.js +2 -0
  20. package/dist/api/templates/.gitignore.js.map +1 -0
  21. package/dist/api/templates/.npmignore.js +1 -0
  22. package/dist/api/templates/.npmignore.js.map +1 -0
  23. package/dist/api/templates/build.rs.js +1 -0
  24. package/dist/api/templates/build.rs.js.map +1 -0
  25. package/dist/api/templates/cargo.toml.js +1 -0
  26. package/dist/api/templates/cargo.toml.js.map +1 -0
  27. package/dist/api/templates/ci-template.js +48 -35
  28. package/dist/api/templates/ci-template.js.map +1 -0
  29. package/dist/api/templates/ci.yml.d.ts +1 -1
  30. package/dist/api/templates/ci.yml.js +10 -3
  31. package/dist/api/templates/ci.yml.js.map +1 -0
  32. package/dist/api/templates/index.js +1 -0
  33. package/dist/api/templates/index.js.map +1 -0
  34. package/dist/api/templates/js-binding.d.ts +1 -1
  35. package/dist/api/templates/js-binding.js +49 -13
  36. package/dist/api/templates/js-binding.js.map +1 -0
  37. package/dist/api/templates/lib.rs.js +1 -0
  38. package/dist/api/templates/lib.rs.js.map +1 -0
  39. package/dist/api/templates/package.json.js +30 -27
  40. package/dist/api/templates/package.json.js.map +1 -0
  41. package/dist/api/universalize.js +1 -0
  42. package/dist/api/universalize.js.map +1 -0
  43. package/dist/api/version.js +1 -0
  44. package/dist/api/version.js.map +1 -0
  45. package/dist/api/wasi-worker-template.d.ts +1 -0
  46. package/dist/api/wasi-worker-template.js +53 -0
  47. package/dist/api/wasi-worker-template.js.map +1 -0
  48. package/dist/cli.js +1 -0
  49. package/dist/cli.js.map +1 -0
  50. package/dist/commands/artifacts.js +2 -2
  51. package/dist/commands/artifacts.js.map +1 -0
  52. package/dist/commands/build.js +1 -0
  53. package/dist/commands/build.js.map +1 -0
  54. package/dist/commands/create-npm-dirs.js +1 -0
  55. package/dist/commands/create-npm-dirs.js.map +1 -0
  56. package/dist/commands/help.js +2 -2
  57. package/dist/commands/help.js.map +1 -0
  58. package/dist/commands/new.js +2 -4
  59. package/dist/commands/new.js.map +1 -0
  60. package/dist/commands/pre-publish.js +1 -0
  61. package/dist/commands/pre-publish.js.map +1 -0
  62. package/dist/commands/rename.js +1 -0
  63. package/dist/commands/rename.js.map +1 -0
  64. package/dist/commands/universalize.js +1 -0
  65. package/dist/commands/universalize.js.map +1 -0
  66. package/dist/commands/version.js +1 -0
  67. package/dist/commands/version.js.map +1 -0
  68. package/dist/def/artifacts.js +2 -2
  69. package/dist/def/artifacts.js.map +1 -0
  70. package/dist/def/build.js +2 -2
  71. package/dist/def/build.js.map +1 -0
  72. package/dist/def/create-npm-dirs.js +2 -2
  73. package/dist/def/create-npm-dirs.js.map +1 -0
  74. package/dist/def/new.js +2 -2
  75. package/dist/def/new.js.map +1 -0
  76. package/dist/def/pre-publish.js +2 -2
  77. package/dist/def/pre-publish.js.map +1 -0
  78. package/dist/def/rename.js +2 -2
  79. package/dist/def/rename.js.map +1 -0
  80. package/dist/def/universalize.js +2 -2
  81. package/dist/def/universalize.js.map +1 -0
  82. package/dist/def/version.js +2 -2
  83. package/dist/def/version.js.map +1 -0
  84. package/dist/index.cjs +2921 -7847
  85. package/dist/index.js +1 -0
  86. package/dist/index.js.map +1 -0
  87. package/dist/utils/__tests__/target.spec.js +1 -0
  88. package/dist/utils/__tests__/target.spec.js.map +1 -0
  89. package/dist/utils/__tests__/typegen.spec.js +2 -1
  90. package/dist/utils/__tests__/typegen.spec.js.map +1 -0
  91. package/dist/utils/__tests__/version.spec.js +1 -0
  92. package/dist/utils/__tests__/version.spec.js.map +1 -0
  93. package/dist/utils/cargo.js +1 -0
  94. package/dist/utils/cargo.js.map +1 -0
  95. package/dist/utils/ci.js +1 -0
  96. package/dist/utils/ci.js.map +1 -0
  97. package/dist/utils/config.d.ts +9 -1
  98. package/dist/utils/config.js +1 -0
  99. package/dist/utils/config.js.map +1 -0
  100. package/dist/utils/index.js +1 -0
  101. package/dist/utils/index.js.map +1 -0
  102. package/dist/utils/log.js +1 -0
  103. package/dist/utils/log.js.map +1 -0
  104. package/dist/utils/metadata.js +1 -0
  105. package/dist/utils/metadata.js.map +1 -0
  106. package/dist/utils/misc.js +1 -0
  107. package/dist/utils/misc.js.map +1 -0
  108. package/dist/utils/target.d.ts +4 -3
  109. package/dist/utils/target.js +10 -0
  110. package/dist/utils/target.js.map +1 -0
  111. package/dist/utils/typegen.d.ts +4 -1
  112. package/dist/utils/typegen.js +21 -1
  113. package/dist/utils/typegen.js.map +1 -0
  114. package/dist/utils/version.js +3 -2
  115. package/dist/utils/version.js.map +1 -0
  116. package/package.json +47 -15
  117. package/src/api/artifacts.ts +7 -4
  118. package/src/api/build.ts +133 -25
  119. package/src/api/load-wasi-template.ts +65 -0
  120. package/src/api/new.ts +1 -4
  121. package/src/api/pre-publish.ts +8 -5
  122. package/src/api/templates/.gitignore.ts +1 -0
  123. package/src/api/templates/ci-template.ts +47 -35
  124. package/src/api/templates/ci.yml.ts +9 -6
  125. package/src/api/templates/js-binding.ts +52 -13
  126. package/src/api/templates/package.json.ts +31 -26
  127. package/src/api/wasi-worker-template.ts +52 -0
  128. package/src/commands/new.ts +1 -5
  129. package/src/utils/__tests__/__snapshots__/version.spec.ts.md +7 -7
  130. package/src/utils/__tests__/__snapshots__/version.spec.ts.snap +0 -0
  131. package/src/utils/__tests__/typegen.spec.ts +1 -1
  132. package/src/utils/config.ts +12 -1
  133. package/src/utils/target.ts +16 -7
  134. package/src/utils/typegen.ts +20 -1
  135. package/src/utils/version.ts +1 -1
package/dist/index.js CHANGED
@@ -28,3 +28,4 @@ export class NapiCli {
28
28
  universalize = universalizeBinaries;
29
29
  version = version;
30
30
  }
31
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAE1C;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,OAAO;IAClB,SAAS,GAAG,gBAAgB,CAAA;IAC5B,GAAG,GAAG,UAAU,CAAA;IAChB,KAAK,GAAG,YAAY,CAAA;IACpB,aAAa,GAAG,aAAa,CAAA;IAC7B,UAAU,GAAG,UAAU,CAAA;IACvB,MAAM,GAAG,aAAa,CAAA;IACtB,YAAY,GAAG,oBAAoB,CAAA;IACnC,OAAO,GAAG,OAAO,CAAA;CAClB"}
@@ -8,3 +8,4 @@ test('should get system default target correctly', (t) => {
8
8
  const target = getSystemDefaultTarget();
9
9
  t.is(target.platform, os.platform());
10
10
  });
11
+ //# sourceMappingURL=target.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"target.spec.js","sourceRoot":"","sources":["../../../src/utils/__tests__/target.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,IAAI,MAAM,KAAK,CAAA;AAEtB,OAAO,EACL,WAAW,EACX,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,cAAc,CAAA;AAErB,IAAI,CAAC,+BAA+B,EAAE,CAAC,CAAC,EAAE,EAAE;IAC1C,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;AAChD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,4CAA4C,EAAE,CAAC,CAAC,EAAE,EAAE;IACvD,MAAM,MAAM,GAAG,sBAAsB,EAAE,CAAA;IAEvC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;AACtC,CAAC,CAAC,CAAA"}
@@ -32,6 +32,7 @@ test('should ident string correctly', (t) => {
32
32
  t.snapshot(correctStringIdent(input, 2), 'original ident is 2');
33
33
  });
34
34
  test('should process type def correctly', async (t) => {
35
- const dts = await processTypeDef(join(fileURLToPath(import.meta.url), '../', '__fixtures__', 'napi_type_def'));
35
+ const { dts } = await processTypeDef(join(fileURLToPath(import.meta.url), '../', '__fixtures__', 'napi_type_def'));
36
36
  t.snapshot(dts);
37
37
  });
38
+ //# sourceMappingURL=typegen.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"typegen.spec.js","sourceRoot":"","sources":["../../../src/utils/__tests__/typegen.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAEnC,OAAO,IAAI,MAAM,KAAK,CAAA;AAEtB,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAElE,IAAI,CAAC,+BAA+B,EAAE,CAAC,CAAC,EAAE,EAAE;IAC1C,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;CAwBf,CAAA;IACC,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAA;IAC/D,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,mCAAmC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACpD,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,cAAc,CAClC,IAAI,CACF,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAC9B,KAAK,EACL,cAAc,EACd,eAAe,CAChB,CACF,CAAA;IAED,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AACjB,CAAC,CAAC,CAAA"}
@@ -3,3 +3,4 @@ import { napiEngineRequirement, NapiVersion } from '../version.js';
3
3
  test('should generate correct napi engine requirement', (t) => {
4
4
  t.snapshot(Object.values(NapiVersion).filter((v) => typeof v === 'number').map(napiEngineRequirement));
5
5
  });
6
+ //# sourceMappingURL=version.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"version.spec.js","sourceRoot":"","sources":["../../../src/utils/__tests__/version.spec.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAA;AAEtB,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAElE,IAAI,CAAC,iDAAiD,EAAE,CAAC,CAAC,EAAE,EAAE;IAC5D,CAAC,CAAC,QAAQ,CAEN,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAE/B,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAC7B,CAAA;AACH,CAAC,CAAC,CAAA"}
@@ -31,3 +31,4 @@ function detectCargoBinary(bin) {
31
31
  return false;
32
32
  }
33
33
  }
34
+ //# sourceMappingURL=cargo.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cargo.js","sourceRoot":"","sources":["../../src/utils/cargo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAEhC,MAAM,UAAU,qBAAqB,CAAC,IAAY,EAAE,GAAW;IAC7D,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE;QAC1B,KAAK,CAAC,oCAAoC,EAAE,IAAI,CAAC,CAAA;QACjD,OAAM;KACP;IAED,IAAI;QACF,KAAK,CAAC,6BAA6B,EAAE,IAAI,CAAC,CAAA;QAC1C,QAAQ,CAAC,iBAAiB,IAAI,EAAE,EAAE;YAChC,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,EAAE,EAAE;YACzD,KAAK,EAAE,CAAC;SACT,CAAC,CAAA;KACH;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAA;IACxC,IAAI;QACF,QAAQ,CAAC,cAAc,GAAG,EAAE,EAAE;YAC5B,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAA;QACF,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;QACvC,OAAO,IAAI,CAAA;KACZ;IAAC,OAAO,CAAC,EAAE;QACV,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAA;QAC3C,OAAO,KAAK,CAAA;KACb;AACH,CAAC"}
package/dist/utils/ci.js CHANGED
@@ -93,3 +93,4 @@ export const CIConfig = {
93
93
  test: false,
94
94
  },
95
95
  };
96
+ //# sourceMappingURL=ci.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ci.js","sourceRoot":"","sources":["../../src/utils/ci.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAcjB;IACF,qBAAqB,EAAE;QACrB,IAAI,EAAE,cAAc;KACrB;IACD,wBAAwB,EAAE;QACxB,IAAI,EAAE,gBAAgB;KACvB;IACD,sBAAsB,EAAE;QACtB,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,KAAK;KACZ;IACD,0BAA0B,EAAE;QAC1B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,gDAAgD;KAC9D;IACD,2BAA2B,EAAE;QAC3B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,gDAAgD;QAC7D,UAAU,EAAE,gCAAgC;QAC5C,SAAS,EAAE,MAAM;KAClB;IACD,sBAAsB,EAAE;QACtB,IAAI,EAAE,cAAc;QACpB,WAAW,EAAE;YACX,wDAAwD;YACxD,6BAA6B;YAC7B,gCAAgC;YAChC,uDAAuD;YACvD,wDAAwD;SACzD;QACD,IAAI,EAAE,KAAK;KACZ;IACD,2BAA2B,EAAE;QAC3B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,wDAAwD;QACrE,WAAW,EAAE;YACX,qBAAqB;YACrB,qEAAqE;YACrE,oDAAoD;SACrD;QACD,UAAU,EAAE,2DAA2D;QACvE,QAAQ,EAAE,OAAO;KAClB;IACD,4BAA4B,EAAE;QAC5B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,gDAAgD;QAC7D,WAAW,EAAE,CAAC,8CAA8C,CAAC;QAC7D,UAAU,EAAE,wCAAwC;QACpD,UAAU,EAAE,CAAC,yBAAyB,CAAC;QACvC,QAAQ,EAAE,OAAO;QACjB,SAAS,EAAE,MAAM;KAClB;IACD,yBAAyB,EAAE;QACzB,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,KAAK;KACZ;IACD,+BAA+B,EAAE;QAC/B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE;YACX,qBAAqB;YACrB,yEAAyE;SAC1E;QACD,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,yDAAyD;KACtE;IACD,uBAAuB,EAAE;QACvB,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE;YACX,gJAAgJ;YAChJ,yGAAyG;YACzG,4GAA4G;YAC5G,qFAAqF;SACtF;QACD,IAAI,EAAE,KAAK;KACZ;IACD,yBAAyB,EAAE;QACzB,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE;YACX,qJAAqJ;YACrJ,4GAA4G;YAC5G,+GAA+G;YAC/G,qFAAqF;SACtF;QACD,IAAI,EAAE,KAAK;KACZ;IACD,6BAA6B,EAAE;QAC7B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE;YACX,qBAAqB;YACrB,qEAAqE;SACtE;QACD,8CAA8C;QAC9C,IAAI,EAAE,KAAK;KACZ;CACF,CAAA"}
@@ -42,7 +42,7 @@ interface UserNapiConfig {
42
42
  additional?: string[];
43
43
  };
44
44
  }
45
- interface CommonPackageJsonFields {
45
+ export interface CommonPackageJsonFields {
46
46
  name: string;
47
47
  version: string;
48
48
  description?: string;
@@ -56,6 +56,14 @@ interface CommonPackageJsonFields {
56
56
  publishConfig?: any;
57
57
  bugs?: any;
58
58
  napi?: UserNapiConfig;
59
+ type?: 'module' | 'commonjs';
60
+ scripts?: Record<string, string>;
61
+ main?: string;
62
+ module?: string;
63
+ types?: string;
64
+ exports?: any;
65
+ dependencies?: Record<string, string>;
66
+ devDependencies?: Record<string, string>;
59
67
  }
60
68
  export type NapiConfig = Required<Pick<UserNapiConfig, 'binaryName' | 'packageName' | 'npmClient'>> & {
61
69
  targets: Target[];
@@ -40,3 +40,4 @@ export async function readNapiConfig(path) {
40
40
  napiConfig.targets = targets.map(parseTriple);
41
41
  return napiConfig;
42
42
  }
43
+ //# sourceMappingURL=config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEvC,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAU,MAAM,aAAa,CAAA;AAmFlE,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY;IAC/C,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE;QAC7B,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAA;KACvD;IACD,gDAAgD;IAChD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACjD,IAAI,OAAO,CAAA;IACX,IAAI;QACF,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAA4B,CAAA;KACzD;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,gCAAgC,EAAE;YAChD,KAAK,EAAE,CAAC;SACT,CAAC,CAAA;KACH;IAED,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAA;IACzC,MAAM,UAAU,GAAe,KAAK,CAClC;QACE,UAAU,EAAE,OAAO;QACnB,WAAW,EAAE,OAAO,CAAC,IAAI;QACzB,OAAO,EAAE,EAAE;QACX,WAAW,EAAE,OAAO;QACpB,SAAS,EAAE,KAAK;KACjB,EACD,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAChC,CAAA;IAED,IAAI,OAAO,GAAa,cAAc,CAAC,OAAO,IAAI,EAAE,CAAA;IAEpD,6BAA6B;IAC7B,IAAI,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE;QAChC,UAAU,CAAC,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAA;KACrD;IAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,IAAI,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE;YACnC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;SAC1C;QAED,IAAI,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE;YAC9C,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;SAC5D;KACF;IAED,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IAE7C,OAAO,UAAU,CAAA;AACnB,CAAC"}
@@ -7,3 +7,4 @@ export * from './metadata.js';
7
7
  export * from './config.js';
8
8
  export * from './cargo.js';
9
9
  export * from './typegen.js';
10
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA"}
package/dist/utils/log.js CHANGED
@@ -12,3 +12,4 @@ export const debugFactory = (namespace) => {
12
12
  return debug;
13
13
  };
14
14
  export const debug = debugFactory('utils');
15
+ //# sourceMappingURL=log.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,WAAW,CAAA;AACnC,OAAO,QAAQ,MAAM,OAAO,CAAA;AAE5B,iCAAiC;AACjC,QAAQ,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE;IAC5B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AACxB,CAAC,CAAA;AAUD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAE,EAAE;IAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,SAAS,EAAE,CAAC,CAAA;IAE3C,KAAK,CAAC,IAAI,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAC9B,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;IAChE,KAAK,CAAC,IAAI,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAC9B,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;IACpE,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAC/B,OAAO,CAAC,KAAK,CACX,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EACrC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CACtD,CACF,CAAA;IAEH,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA"}
@@ -17,3 +17,4 @@ export function parseMetadata(manifestPath) {
17
17
  });
18
18
  }
19
19
  }
20
+ //# sourceMappingURL=metadata.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/utils/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,MAAM,IAAI,CAAA;AAqCnB,MAAM,UAAU,aAAa,CAAC,YAAoB;IAChD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,+BAA+B,YAAY,EAAE,CAAC,CAAA;KAC/D;IAED,MAAM,GAAG,GAAG,kCAAkC,YAAY,+BAA+B,CAAA;IAEzF,IAAI;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE;YAC3B,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAA2B,CAAA;KACpD;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,qDAAqD,GAAG,EAAE,EAC1D;YACE,KAAK,EAAE,CAAC;SACT,CACF,CAAA;KACF;AACH,CAAC"}
@@ -38,3 +38,4 @@ export async function updatePackageJson(path, partial) {
38
38
  await writeFileAsync(path, JSON.stringify({ ...old, ...partial }, null, 2));
39
39
  }
40
40
  export const CLI_VERSION = pkgJson.version;
41
+ //# sourceMappingURL=misc.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"misc.js","sourceRoot":"","sources":["../../src/utils/misc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,IAAI,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAEhC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAEhC,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC9C,QAAQ;AACR,4EAA4E;AAC5E,iDAAiD;AACjD,2DAA2D;AAC3D,6DAA6D;AAC7D,MAAM,OAAO,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAA;AAEpD,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AAChD,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC,SAAS,CAAC,CAAA;AAClD,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;AAC5C,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AAChD,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;AAC1C,MAAM,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;AACxC,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;AAE9C,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAY;IAC3C,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC;SACjC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;SAChB,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAA;IACrB,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,UAAU,IAAI,CAAuB,CAAI,EAAE,GAAG,IAAS;IAC3D,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;QACjB,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,EAAO,CAAC,CAAA;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAAY,EACZ,OAA4B;IAE5B,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAA;IACrC,IAAI,CAAC,MAAM,EAAE;QACX,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAA;QAChC,OAAM;KACP;IACD,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,MAAM,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AAC7E,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAA"}
@@ -1,16 +1,17 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
+ export type Platform = NodeJS.Platform | 'wasm' | 'wasi';
2
3
  export declare const AVAILABLE_TARGETS: readonly ["aarch64-apple-darwin", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-freebsd", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", "armv7-linux-androideabi", "universal-apple-darwin", "riscv64gc-unknown-linux-gnu"];
3
4
  export type TargetTriple = (typeof AVAILABLE_TARGETS)[number];
4
5
  export declare const DEFAULT_TARGETS: readonly ["x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu"];
5
6
  export declare const TARGET_LINKER: Record<string, string>;
6
7
  type NodeJSArch = 'arm' | 'arm64' | 'ia32' | 'mips' | 'mipsel' | 'ppc' | 'ppc64' | 'riscv64' | 's390' | 's390x' | 'x32' | 'x64' | 'universal';
7
8
  export declare const NodeArchToCpu: Record<string, string>;
8
- export declare const UniArchsByPlatform: Partial<Record<NodeJS.Platform, NodeJSArch[]>>;
9
+ export declare const UniArchsByPlatform: Partial<Record<Platform, NodeJSArch[]>>;
9
10
  export interface Target {
10
11
  triple: string;
11
12
  platformArchABI: string;
12
- platform: NodeJS.Platform;
13
- arch: NodeJSArch;
13
+ platform: Platform;
14
+ arch: NodeJSArch | 'wasm32';
14
15
  abi: string | null;
15
16
  }
16
17
  /**
@@ -59,6 +59,15 @@ export const UniArchsByPlatform = {
59
59
  * - `abi` = The ABI, for example `gnu`, `android`, `eabi`, etc.
60
60
  */
61
61
  export function parseTriple(rawTriple) {
62
+ if (rawTriple === 'wasm32-wasi-preview1-threads') {
63
+ return {
64
+ triple: rawTriple,
65
+ platformArchABI: rawTriple,
66
+ platform: 'wasi',
67
+ arch: 'wasm32',
68
+ abi: 'wasi',
69
+ };
70
+ }
62
71
  const triple = rawTriple.endsWith('eabi')
63
72
  ? `${rawTriple.slice(0, -4)}-eabi`
64
73
  : rawTriple;
@@ -109,3 +118,4 @@ export function getTargetLinker(target) {
109
118
  export function targetToEnvVar(target) {
110
119
  return target.replace(/-/g, '_').toUpperCase();
111
120
  }
121
+ //# sourceMappingURL=target.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/utils/target.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,6 @@
1
1
  export declare const DEFAULT_TYPE_DEF_HEADER = "/* auto-generated by NAPI-RS */\n/* eslint-disable */\n";
2
- export declare function processTypeDef(intermediateTypeFile: string, header?: string): Promise<string>;
2
+ export declare function processTypeDef(intermediateTypeFile: string, header?: string): Promise<{
3
+ dts: string;
4
+ exports: string[];
5
+ }>;
3
6
  export declare function correctStringIdent(src: string, ident: number): string;
@@ -34,6 +34,7 @@ function prettyPrint(line, ident) {
34
34
  return correctStringIdent(s, ident);
35
35
  }
36
36
  export async function processTypeDef(intermediateTypeFile, header) {
37
+ const exports = [];
37
38
  const defs = await readIntermediateTypeFile(intermediateTypeFile);
38
39
  const groupedDefs = preprocessTypeDef(defs);
39
40
  header = header ? header + '\n' : '';
@@ -42,9 +43,24 @@ export async function processTypeDef(intermediateTypeFile, header) {
42
43
  if (namespace === TOP_LEVEL_NAMESPACE) {
43
44
  for (const def of defs) {
44
45
  dts += prettyPrint(def, 0) + '\n\n';
46
+ switch (def.kind) {
47
+ case TypeDefKind.Const:
48
+ case TypeDefKind.Enum:
49
+ case TypeDefKind.Fn:
50
+ case TypeDefKind.Struct: {
51
+ exports.push(def.name);
52
+ if (def.original_name && def.original_name !== def.name) {
53
+ exports.push(def.original_name);
54
+ }
55
+ break;
56
+ }
57
+ default:
58
+ break;
59
+ }
45
60
  }
46
61
  }
47
62
  else {
63
+ exports.push(namespace);
48
64
  dts += `export namespace ${namespace} {\n`;
49
65
  for (const def of defs) {
50
66
  dts += prettyPrint(def, 2) + '\n';
@@ -62,7 +78,10 @@ export class ExternalObject<T> {
62
78
  }
63
79
  `;
64
80
  }
65
- return header + dts;
81
+ return {
82
+ dts: header + dts,
83
+ exports,
84
+ };
66
85
  }
67
86
  async function readIntermediateTypeFile(file) {
68
87
  const content = await readFileAsync(file, 'utf8');
@@ -156,3 +175,4 @@ export function correctStringIdent(src, ident) {
156
175
  .join('\n');
157
176
  return result;
158
177
  }
178
+ //# sourceMappingURL=typegen.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../src/utils/typegen.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ export var NapiVersion;
8
8
  NapiVersion[NapiVersion["Napi6"] = 6] = "Napi6";
9
9
  NapiVersion[NapiVersion["Napi7"] = 7] = "Napi7";
10
10
  NapiVersion[NapiVersion["Napi8"] = 8] = "Napi8";
11
- })(NapiVersion = NapiVersion || (NapiVersion = {}));
11
+ })(NapiVersion || (NapiVersion = {}));
12
12
  /// because node support new napi version in some minor version updates, so we might meet such situation:
13
13
  /// `node v10.20.0` supports `napi5` and `napi6`, but `node v12.0.0` only support `napi4`,
14
14
  /// by which, we can not tell directly napi version supportness from node version directly.
@@ -52,8 +52,9 @@ function toEngineRequirement(versions) {
52
52
  req += `${i === 0 ? '' : ' || '}>= ${v.major}.${v.minor}.${v.patch}`;
53
53
  requirements.push(req);
54
54
  });
55
- return requirements.join(' && ');
55
+ return requirements.join(' ');
56
56
  }
57
57
  export function napiEngineRequirement(napiVersion) {
58
58
  return toEngineRequirement(requiredNodeVersions(napiVersion));
59
59
  }
60
+ //# sourceMappingURL=version.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,WASX;AATD,WAAY,WAAW;IACrB,+CAAS,CAAA;IACT,+CAAK,CAAA;IACL,+CAAK,CAAA;IACL,+CAAK,CAAA;IACL,+CAAK,CAAA;IACL,+CAAK,CAAA;IACL,+CAAK,CAAA;IACL,+CAAK,CAAA;AACP,CAAC,EATW,WAAW,KAAX,WAAW,QAStB;AAED,yGAAyG;AACzG,0FAA0F;AAC1F,2FAA2F;AAC3F,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAsB;IACvD,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC;IAC5B,CAAC,WAAW,CAAC,KAAK,EAAE,gBAAgB,CAAC;IACrC,CAAC,WAAW,CAAC,KAAK,EAAE,0BAA0B,CAAC;IAC/C,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAkB,CAAC;IACvC,CAAC,WAAW,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACxC,CAAC,WAAW,CAAC,KAAK,EAAE,4BAA4B,CAAC;IACjD,CAAC,WAAW,CAAC,KAAK,EAAE,6BAA6B,CAAC;IAClD,CAAC,WAAW,CAAC,KAAK,EAAE,6BAA6B,CAAC;CACnD,CAAC,CAAA;AAQF,SAAS,gBAAgB,CAAC,CAAS;IACjC,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;IAE1D,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,CAAC,CAAC,CAAA;KACrD;IAED,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,OAAO,CAAA;IAEvC,OAAO;QACL,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtB,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtB,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;KACvB,CAAA;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAwB;IACpD,MAAM,WAAW,GAAG,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IAExD,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAA;KACpC;IAED,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;AACrD,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAuB;IAClD,MAAM,YAAY,GAAa,EAAE,CAAA;IACjC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACxB,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,KAAK,CAAC,EAAE;YACX,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;YACnC,GAAG,IAAI,KAAK,WAAW,CAAC,KAAK,GAAG,CAAC,EAAE,CAAA;SACpC;QAED,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,EAAE,CAAA;QACpE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC/B,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,WAAwB;IAC5D,OAAO,mBAAmB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAA;AAC/D,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@napi-rs/cli",
3
- "version": "3.0.0-alpha.4",
3
+ "version": "3.0.0-alpha.6",
4
4
  "description": "Cli tools for napi-rs",
5
5
  "author": "LongYinan <lynweklm@gmail.com>",
6
6
  "homepage": "https://github.com/napi-rs/napi-rs",
@@ -67,24 +67,48 @@
67
67
  "url": "https://github.com/napi-rs/napi-rs/issues"
68
68
  },
69
69
  "dependencies": {
70
- "@octokit/rest": "^19.0.7",
71
- "clipanion": "^3.2.0",
72
- "colorette": "^2.0.19",
70
+ "@octokit/rest": "^20.0.2",
71
+ "@tybys/wasm-util": "0.8.0",
72
+ "clipanion": "^3.2.1",
73
+ "colorette": "^2.0.20",
73
74
  "debug": "^4.3.4",
74
- "inquirer": "^9.1.5",
75
+ "emnapi": "0.43.1",
76
+ "inquirer": "^9.2.11",
75
77
  "js-yaml": "^4.1.0",
76
78
  "lodash-es": "^4.17.21",
77
- "typanion": "^3.12.1"
79
+ "toml": "^3.0.0",
80
+ "typanion": "^3.14.0"
78
81
  },
79
82
  "devDependencies": {
80
- "@types/inquirer": "^9.0.3",
81
- "@types/js-yaml": "^4.0.5",
82
- "@types/lodash-es": "^4.17.7",
83
- "ava": "^5.2.0",
84
- "esbuild": "^0.17.16",
85
- "prettier": "^2.8.7",
83
+ "@emnapi/core": "0.43.1",
84
+ "@emnapi/runtime": "0.43.1",
85
+ "@types/debug": "^4.1.10",
86
+ "@types/inquirer": "^9.0.6",
87
+ "@types/js-yaml": "^4.0.8",
88
+ "@types/lodash-es": "^4.17.10",
89
+ "ava": "^5.3.1",
90
+ "env-paths": "^3.0.0",
91
+ "esbuild": "^0.19.5",
92
+ "prettier": "^3.0.3",
86
93
  "ts-node": "^10.9.1",
87
- "typescript": "^5.0.4"
94
+ "tslib": "^2.6.2",
95
+ "typescript": "^5.2.2"
96
+ },
97
+ "peerDependencies": {
98
+ "@emnapi/runtime": "0.43.1",
99
+ "@tybys/wasm-util": "0.8.0",
100
+ "emnapi": "0.43.1"
101
+ },
102
+ "peerDependenciesMeta": {
103
+ "@emnapi/runtime": {
104
+ "optional": true
105
+ },
106
+ "@tybys/wasm-util": {
107
+ "optional": true
108
+ },
109
+ "emnapi": {
110
+ "optional": true
111
+ }
88
112
  },
89
113
  "funding": {
90
114
  "type": "github",
@@ -94,7 +118,15 @@
94
118
  "codegen": "node --loader ts-node/esm/transpile-only ./codegen/index.ts",
95
119
  "build": "tsc && yarn build:cjs",
96
120
  "build:cjs": "node ./esbuild.mjs",
97
- "test": "ava"
121
+ "test": "node --loader ts-node/esm/transpile-only ../node_modules/ava/entrypoints/cli.mjs"
122
+ },
123
+ "ava": {
124
+ "extensions": {
125
+ "ts": "module"
126
+ },
127
+ "files": [
128
+ "**/__tests__/**/*.spec.ts"
129
+ ]
98
130
  },
99
- "gitHead": "0302e564faad54dcfe6c91c9a7f26749a6a0d8e8"
131
+ "gitHead": "be755a1d51cb164fd0288d32a6b9ae7b4416449c"
100
132
  }
@@ -1,4 +1,4 @@
1
- import { join, parse, resolve } from 'path'
1
+ import { join, parse, resolve } from 'node:path'
2
2
 
3
3
  import * as colors from 'colorette'
4
4
 
@@ -30,8 +30,8 @@ export async function collectArtifacts(userOptions: ArtifactsOptions) {
30
30
  const universalSourceBins = new Set(
31
31
  targets
32
32
  .filter((platform) => platform.arch === 'universal')
33
- .flatMap((p) =>
34
- UniArchsByPlatform[p.platform]?.map((a) => `${p.platform}-${a}`),
33
+ .flatMap(
34
+ (p) => UniArchsByPlatform[p.platform]?.map((a) => `${p.platform}-${a}`),
35
35
  )
36
36
  .filter(Boolean) as string[],
37
37
  )
@@ -43,7 +43,10 @@ export async function collectArtifacts(userOptions: ArtifactsOptions) {
43
43
  debug.info(`Read [${colors.yellowBright(filePath)}]`)
44
44
  const sourceContent = await readFileAsync(filePath)
45
45
  const parsedName = parse(filePath)
46
- const [_binaryName, platformArchABI] = parsedName.name.split('.')
46
+ const terms = parsedName.name.split('.')
47
+ const platformArchABI = terms.pop()!
48
+ const _binaryName = terms.join('.')
49
+
47
50
  if (_binaryName !== binaryName) {
48
51
  debug.warn(
49
52
  `[${_binaryName}] is not matched with [${binaryName}], skip`,