piral-cli 0.15.9-beta.5415 → 0.15.9-beta.5420

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.
@@ -1,5 +1,6 @@
1
1
  export declare const defaultRegistry = "https://registry.npmjs.org/";
2
2
  export declare const filesTar = "files";
3
+ export declare const packageJson = "package.json";
3
4
  export declare const filesOnceTar = "files_once";
4
5
  export declare const piralBaseRoot = "piral-base/package.json";
5
6
  export declare const frameworkLibs: ("piral-native" | "piral" | "piral-core" | "piral-base")[];
@@ -1,8 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.legacyCoreExternals = exports.declarationEntryExtensions = exports.bundlerNames = exports.entryModuleExtensions = exports.piralJsonSchemaUrl = exports.piletJsonSchemaUrl = exports.frameworkLibs = exports.piralBaseRoot = exports.filesOnceTar = exports.filesTar = exports.defaultRegistry = void 0;
3
+ exports.legacyCoreExternals = exports.declarationEntryExtensions = exports.bundlerNames = exports.entryModuleExtensions = exports.piralJsonSchemaUrl = exports.piletJsonSchemaUrl = exports.frameworkLibs = exports.piralBaseRoot = exports.filesOnceTar = exports.packageJson = exports.filesTar = exports.defaultRegistry = void 0;
4
4
  exports.defaultRegistry = 'https://registry.npmjs.org/';
5
5
  exports.filesTar = 'files';
6
+ exports.packageJson = 'package.json';
6
7
  exports.filesOnceTar = 'files_once';
7
8
  exports.piralBaseRoot = 'piral-base/package.json';
8
9
  exports.frameworkLibs = ['piral-native', 'piral', 'piral-core', 'piral-base'];
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,6BAA6B,CAAC;AAChD,QAAA,QAAQ,GAAG,OAAO,CAAC;AACnB,QAAA,YAAY,GAAG,YAAY,CAAC;AAC5B,QAAA,aAAa,GAAG,yBAAyB,CAAC;AAC1C,QAAA,aAAa,GAAG,CAAC,cAAuB,EAAE,OAAgB,EAAE,YAAqB,EAAE,YAAqB,CAAC,CAAC;AAC1G,QAAA,kBAAkB,GAAG,6CAA6C,CAAC;AACnE,QAAA,kBAAkB,GAAG,6CAA6C,CAAC;AACnE,QAAA,qBAAqB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvD,QAAA,YAAY,GAAG;IAC1B,SAAkB;IAClB,QAAiB;IACjB,SAAkB;IAClB,QAAiB;IACjB,QAAiB;IACjB,SAAkB;IAClB,UAAmB;IACnB,MAAe;IACf,QAAiB;CAClB,CAAC;AACW,QAAA,0BAA0B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,6BAAqB,CAAC,CAAC;AACzE,QAAA,mBAAmB,GAAG;IACjC,sBAAsB;IACtB,aAAa;IACb,SAAS;IACT,OAAO;IACP,WAAW;IACX,cAAc;IACd,kBAAkB;IAClB,OAAO;IACP,gBAAgB;CACjB,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,6BAA6B,CAAC;AAChD,QAAA,QAAQ,GAAG,OAAO,CAAC;AACnB,QAAA,WAAW,GAAG,cAAc,CAAC;AAC7B,QAAA,YAAY,GAAG,YAAY,CAAC;AAC5B,QAAA,aAAa,GAAG,yBAAyB,CAAC;AAC1C,QAAA,aAAa,GAAG,CAAC,cAAuB,EAAE,OAAgB,EAAE,YAAqB,EAAE,YAAqB,CAAC,CAAC;AAC1G,QAAA,kBAAkB,GAAG,6CAA6C,CAAC;AACnE,QAAA,kBAAkB,GAAG,6CAA6C,CAAC;AACnE,QAAA,qBAAqB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvD,QAAA,YAAY,GAAG;IAC1B,SAAkB;IAClB,QAAiB;IACjB,SAAkB;IAClB,QAAiB;IACjB,QAAiB;IACjB,SAAkB;IAClB,UAAmB;IACnB,MAAe;IACf,QAAiB;CAClB,CAAC;AACW,QAAA,0BAA0B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,6BAAqB,CAAC,CAAC;AACzE,QAAA,mBAAmB,GAAG;IACjC,sBAAsB;IACtB,aAAa;IACb,SAAS;IACT,OAAO;IACP,WAAW;IACX,cAAc;IACd,kBAAkB;IAClB,OAAO;IACP,gBAAgB;CACjB,CAAC"}
@@ -20,11 +20,10 @@ const declaration_1 = require("./declaration");
20
20
  const enums_1 = require("./enums");
21
21
  const archive_1 = require("./archive");
22
22
  const io_1 = require("./io");
23
- const packageJson = 'package.json';
24
23
  function createEmulatorSources(sourceDir, externals, targetDir, targetFile, logLevel) {
25
24
  var _a, _b, _c, _d;
26
25
  return __awaiter(this, void 0, void 0, function* () {
27
- const piralPkg = require((0, path_1.resolve)(sourceDir, packageJson));
26
+ const piralPkg = require((0, path_1.resolve)(sourceDir, constants_1.packageJson));
28
27
  const files = (_b = (_a = piralPkg.pilets) === null || _a === void 0 ? void 0 : _a.files) !== null && _b !== void 0 ? _b : [];
29
28
  const allDeps = Object.assign(Object.assign({}, piralPkg.devDependencies), piralPkg.dependencies);
30
29
  const externalPackages = yield Promise.all(externals
@@ -32,7 +31,7 @@ function createEmulatorSources(sourceDir, externals, targetDir, targetFile, logL
32
31
  .map((external) => __awaiter(this, void 0, void 0, function* () {
33
32
  return ({
34
33
  name: external.name,
35
- version: yield (0, package_1.findDependencyVersion)(piralPkg, sourceDir, external.name, external.parents),
34
+ version: yield (0, package_1.findDependencyVersion)(piralPkg, sourceDir, external),
36
35
  });
37
36
  })));
38
37
  const externalDependencies = externalPackages.reduce((deps, dep) => {
@@ -53,9 +52,9 @@ function createEmulatorSources(sourceDir, externals, targetDir, targetFile, logL
53
52
  .filter((file) => typeof file.to === 'string' && typeof file.from === 'string')
54
53
  .map((file) => (Object.assign(Object.assign({}, file), { to: file.to.replace(/\\/g, '/'), from: (0, path_1.join)('files', file.to).replace(/\\/g, '/') })));
55
54
  // do not modify an existing JSON
56
- yield (0, io_1.createFileIfNotExists)(rootDir, packageJson, '{}');
55
+ yield (0, io_1.createFileIfNotExists)(rootDir, constants_1.packageJson, '{}');
57
56
  // patch the JSON relevant for th eproject
58
- yield (0, io_1.updateExistingJson)(rootDir, packageJson, {
57
+ yield (0, io_1.updateExistingJson)(rootDir, constants_1.packageJson, {
59
58
  name: piralPkg.name,
60
59
  description: piralPkg.description,
61
60
  version: piralPkg.version,
@@ -1 +1 @@
1
- {"version":3,"file":"emulator.js","sourceRoot":"","sources":["../../src/common/emulator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"emulator.js","sourceRoot":"","sources":["../../src/common/emulator.ts"],"names":[],"mappings":"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"}
@@ -17,6 +17,18 @@ const hash_1 = require("./hash");
17
17
  const io_1 = require("./io");
18
18
  const npm_1 = require("./npm");
19
19
  const shorthandsUrls = ['', '.', '...'];
20
+ function addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, entry, assetName) {
21
+ const alias = realIdentifier !== identifier ? realIdentifier : undefined;
22
+ dependencies.push({
23
+ id: `${identifier}@${version}`,
24
+ requireId: `${identifier}@${requireVersion}`,
25
+ entry,
26
+ name: identifier,
27
+ ref: `${assetName}.js`,
28
+ type: 'local',
29
+ alias,
30
+ });
31
+ }
20
32
  function getDependencyDetails(depName) {
21
33
  const sep = depName.indexOf('@', 1);
22
34
  const version = sep > 0 ? depName.substring(sep + 1) : '';
@@ -36,9 +48,9 @@ function getLocalDependencyVersion(packageJson, depName, versionSpec) {
36
48
  if (!(0, version_1.satisfies)(details.version, versionSpec)) {
37
49
  (0, log_1.fail)('importMapVersionSpecNotSatisfied_0025', depName, details.version);
38
50
  }
39
- return [details.version, versionSpec];
51
+ return [details.name, details.version, versionSpec];
40
52
  }
41
- return [details.version, details.version];
53
+ return [details.name, details.version, details.version];
42
54
  });
43
55
  }
44
56
  function getInheritedDependencies(inheritedImport, dir) {
@@ -87,15 +99,8 @@ function resolveImportmap(dir, importmap) {
87
99
  const entry = (0, npm_1.tryResolvePackage)(identifier, dir);
88
100
  if (entry) {
89
101
  const packageJson = yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
90
- const [version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec);
91
- dependencies.push({
92
- id: `${identifier}@${version}`,
93
- requireId: `${identifier}@${requireVersion}`,
94
- entry,
95
- name: identifier,
96
- ref: `${assetName}.js`,
97
- type: 'local',
98
- });
102
+ const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec);
103
+ addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, entry, assetName);
99
104
  }
100
105
  else {
101
106
  (0, log_1.fail)('importMapReferenceNotFound_0027', dir, identifier);
@@ -105,15 +110,8 @@ function resolveImportmap(dir, importmap) {
105
110
  const entry = (0, npm_1.tryResolvePackage)(url, dir);
106
111
  if (entry) {
107
112
  const packageJson = yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
108
- const [version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec);
109
- dependencies.push({
110
- id: `${identifier}@${version}`,
111
- requireId: `${identifier}@${requireVersion}`,
112
- entry,
113
- name: identifier,
114
- ref: `${assetName}.js`,
115
- type: 'local',
116
- });
113
+ const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec);
114
+ addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, entry, assetName);
117
115
  }
118
116
  else {
119
117
  (0, log_1.fail)('importMapReferenceNotFound_0027', dir, url);
@@ -129,15 +127,8 @@ function resolveImportmap(dir, importmap) {
129
127
  : yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
130
128
  const packageJsonExists = yield (0, io_1.checkExists)(packageJson);
131
129
  if (packageJsonExists) {
132
- const [version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec);
133
- dependencies.push({
134
- id: `${identifier}@${version}`,
135
- requireId: `${identifier}@${requireVersion}`,
136
- entry: isDirectory ? (0, npm_1.tryResolvePackage)(entry, dir) : entry,
137
- name: identifier,
138
- ref: `${assetName}.js`,
139
- type: 'local',
140
- });
130
+ const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec);
131
+ addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, isDirectory ? (0, npm_1.tryResolvePackage)(entry, dir) : entry, assetName);
141
132
  }
142
133
  else if (isDirectory) {
143
134
  (0, log_1.fail)('importMapReferenceNotFound_0027', entry, 'package.json');
@@ -1 +1 @@
1
- {"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA8D;AAC9D,+BAAkC;AAClC,uCAAgD;AAChD,iCAAqC;AACrC,6BAAkF;AAClF,+BAA0C;AAG1C,MAAM,cAAc,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAExC,SAAS,oBAAoB,CAAC,OAAe;IAC3C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1D,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IACzD,MAAM,SAAS,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC5G,OAAO,CAAC,SAAS,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,SAAe,yBAAyB,CACtC,WAAmB,EACnB,OAAe,EACf,WAAmB;;QAEnB,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,WAAW,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,MAAM,IAAA,aAAQ,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAExD,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,IAAA,kBAAQ,EAAC,WAAW,CAAC,EAAE;gBAC1B,IAAA,UAAI,EAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC;aACnD;YAED,IAAI,CAAC,IAAA,mBAAS,EAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE;gBAC5C,IAAA,UAAI,EAAC,uCAAuC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;aACzE;YAED,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;SACvC;QAED,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;CAAA;AAED,SAAe,wBAAwB,CAAC,eAAuB,EAAE,GAAW;;QAC1E,MAAM,WAAW,GAAG,IAAA,uBAAiB,EAAC,GAAG,eAAe,eAAe,EAAE,GAAG,CAAC,CAAC;QAE9E,IAAI,WAAW,EAAE;YACf,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;YACxC,MAAM,cAAc,GAAG,MAAM,IAAA,aAAQ,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;YAClE,OAAO,aAAa,CAAC,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,eAAe,GAAG,IAAA,uBAAiB,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YAEhE,IAAI,eAAe,EAAE;gBACnB,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;gBACzC,MAAM,OAAO,GAAG,MAAM,IAAA,aAAQ,EAAC,OAAO,EAAE,IAAA,eAAQ,EAAC,eAAe,CAAC,CAAC,CAAC;gBACnE,OAAO,MAAM,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;aACjD;SACF;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CAAA;AAED,SAAe,gBAAgB,CAAC,GAAW,EAAE,SAAoB;;QAC/D,MAAM,YAAY,GAA4B,EAAE,CAAC;QACjD,MAAM,aAAa,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC;QACzC,MAAM,gBAAgB,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC;QAE5C,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,EAAE;YACtD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;gBAChD,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;gBACnC,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;gBAE3E,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;oBAC3B,IAAA,SAAG,EAAC,kBAAkB,EAAE,iBAAiB,OAAO,yDAAyD,CAAC,CAAC;iBAC5G;qBAAM,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;oBACnC,MAAM,IAAI,GAAG,IAAA,kBAAW,EAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBAE9C,YAAY,CAAC,IAAI,CAAC;wBAChB,EAAE,EAAE,GAAG,UAAU,IAAI,IAAI,EAAE;wBAC3B,SAAS,EAAE,GAAG,UAAU,IAAI,IAAI,EAAE;wBAClC,KAAK,EAAE,GAAG;wBACV,IAAI,EAAE,UAAU;wBAChB,GAAG,EAAE,GAAG;wBACR,IAAI,EAAE,QAAQ;qBACf,CAAC,CAAC;iBACJ;qBAAM,IAAI,GAAG,KAAK,UAAU,IAAI,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBAC7D,MAAM,KAAK,GAAG,IAAA,uBAAiB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;oBAEjD,IAAI,KAAK,EAAE;wBACT,MAAM,WAAW,GAAG,MAAM,IAAA,aAAQ,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,EAAE,cAAc,CAAC,CAAC;wBACnE,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,MAAM,yBAAyB,CAAC,WAAW,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;wBAErG,YAAY,CAAC,IAAI,CAAC;4BAChB,EAAE,EAAE,GAAG,UAAU,IAAI,OAAO,EAAE;4BAC9B,SAAS,EAAE,GAAG,UAAU,IAAI,cAAc,EAAE;4BAC5C,KAAK;4BACL,IAAI,EAAE,UAAU;4BAChB,GAAG,EAAE,GAAG,SAAS,KAAK;4BACtB,IAAI,EAAE,OAAO;yBACd,CAAC,CAAC;qBACJ;yBAAM;wBACL,IAAA,UAAI,EAAC,iCAAiC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;qBAC1D;iBACF;qBAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,EAAC,GAAG,CAAC,EAAE;oBACnD,MAAM,KAAK,GAAG,IAAA,uBAAiB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;oBAE1C,IAAI,KAAK,EAAE;wBACT,MAAM,WAAW,GAAG,MAAM,IAAA,aAAQ,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,EAAE,cAAc,CAAC,CAAC;wBACnE,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,MAAM,yBAAyB,CAAC,WAAW,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;wBAErG,YAAY,CAAC,IAAI,CAAC;4BAChB,EAAE,EAAE,GAAG,UAAU,IAAI,OAAO,EAAE;4BAC9B,SAAS,EAAE,GAAG,UAAU,IAAI,cAAc,EAAE;4BAC5C,KAAK;4BACL,IAAI,EAAE,UAAU;4BAChB,GAAG,EAAE,GAAG,SAAS,KAAK;4BACtB,IAAI,EAAE,OAAO;yBACd,CAAC,CAAC;qBACJ;yBAAM;wBACL,IAAA,UAAI,EAAC,iCAAiC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;qBACnD;iBACF;qBAAM;oBACL,MAAM,KAAK,GAAG,IAAA,cAAO,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;oBAChC,MAAM,MAAM,GAAG,MAAM,IAAA,gBAAW,EAAC,KAAK,CAAC,CAAC;oBAExC,IAAI,MAAM,EAAE;wBACV,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAgB,EAAC,KAAK,CAAC,CAAC;wBAClD,MAAM,WAAW,GAAG,WAAW;4BAC7B,CAAC,CAAC,IAAA,cAAO,EAAC,KAAK,EAAE,cAAc,CAAC;4BAChC,CAAC,CAAC,MAAM,IAAA,aAAQ,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,EAAE,cAAc,CAAC,CAAC;wBACnD,MAAM,iBAAiB,GAAG,MAAM,IAAA,gBAAW,EAAC,WAAW,CAAC,CAAC;wBAEzD,IAAI,iBAAiB,EAAE;4BACrB,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,MAAM,yBAAyB,CAAC,WAAW,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;4BAErG,YAAY,CAAC,IAAI,CAAC;gCAChB,EAAE,EAAE,GAAG,UAAU,IAAI,OAAO,EAAE;gCAC9B,SAAS,EAAE,GAAG,UAAU,IAAI,cAAc,EAAE;gCAC5C,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,IAAA,uBAAiB,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK;gCAC1D,IAAI,EAAE,UAAU;gCAChB,GAAG,EAAE,GAAG,SAAS,KAAK;gCACtB,IAAI,EAAE,OAAO;6BACd,CAAC,CAAC;yBACJ;6BAAM,IAAI,WAAW,EAAE;4BACtB,IAAA,UAAI,EAAC,iCAAiC,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;yBAChE;6BAAM;4BACL,MAAM,IAAI,GAAG,MAAM,IAAA,YAAO,EAAC,KAAK,CAAC,CAAC;4BAElC,YAAY,CAAC,IAAI,CAAC;gCAChB,EAAE,EAAE,GAAG,UAAU,IAAI,IAAI,EAAE;gCAC3B,SAAS,EAAE,GAAG,UAAU,IAAI,IAAI,EAAE;gCAClC,KAAK;gCACL,IAAI,EAAE,UAAU;gCAChB,GAAG,EAAE,GAAG,SAAS,KAAK;gCACtB,IAAI,EAAE,OAAO;6BACd,CAAC,CAAC;yBACJ;qBACF;yBAAM;wBACL,IAAA,UAAI,EAAC,iCAAiC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;qBACnD;iBACF;aACF;SACF;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;YACnC,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE;gBAC9C,MAAM,iBAAiB,GAAG,MAAM,wBAAwB,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;gBAE/E,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE;oBAC1C,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;oBAEvE,IAAI,CAAC,KAAK,EAAE;wBACV,YAAY,CAAC,IAAI,iCACZ,UAAU,KACb,OAAO,EAAE,CAAC,eAAe,CAAC,IAC1B,CAAC;qBACJ;yBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;wBACvC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;qBACrC;iBACF;aACF;SACF;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CAAA;AAED,SAAsB,aAAa,CACjC,GAAW,EACX,cAAmB,EACnB,SAAS,GAAG,KAAK;;;QAEjB,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC;QAE3C,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACjC,MAAM,QAAQ,GAAG,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,MAAM,IAAA,aAAQ,EAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YAEzD,IAAI,OAAO,KAAK,QAAQ,EAAE;gBACxB,IAAA,UAAI,EAAC,4BAA4B,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;aACpD;YAED,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACjD;aAAM,IAAI,OAAO,SAAS,KAAK,WAAW,IAAI,SAAS,EAAE;YACxD,kEAAkE;YAClE,MAAM,MAAM,GAAkB,MAAA,cAAc,CAAC,kBAAkB,mCAAI,MAAA,cAAc,CAAC,MAAM,0CAAE,SAAS,CAAC;YAEpG,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBACzB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBAC1B,EAAE,EAAE,GAAG;oBACP,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,GAAG;oBACV,IAAI,EAAE,OAAO;oBACb,GAAG,EAAE,SAAS;oBACd,SAAS,EAAE,GAAG;iBACf,CAAC,CAAC,CAAC;aACL;SACF;QAED,OAAO,MAAM,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;;CAC/C;AAlCD,sCAkCC"}
1
+ {"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"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"}
@@ -17,6 +17,8 @@ export declare function findNpmTarball(packageRef: string): Promise<string>;
17
17
  export declare function findSpecificVersion(packageName: string, version: string): Promise<string>;
18
18
  export declare function findLatestVersion(packageName: string): Promise<string>;
19
19
  export declare function isLocalPackage(baseDir: string, fullName: string): boolean;
20
+ export declare function isNpmPackage(fullName: string): boolean;
21
+ export declare function makeNpmAlias(name: string, version: string): string;
20
22
  export declare function isGitPackage(fullName: string): boolean;
21
23
  export declare function makeGitUrl(fullName: string): string;
22
24
  export declare function makeFilePath(basePath: string, fullName: string): string;
package/lib/common/npm.js CHANGED
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.makeExternals = exports.mergeExternals = exports.makePiletExternals = exports.getPackageVersion = exports.getGitPackageVersion = exports.getFilePackageVersion = exports.getPackageName = exports.combinePackageRef = exports.isLinkedPackage = exports.findPackageRoot = exports.tryResolvePackage = exports.getCurrentPackageDetails = exports.dissectPackageName = exports.makeFilePath = exports.makeGitUrl = exports.isGitPackage = exports.isLocalPackage = exports.findLatestVersion = exports.findSpecificVersion = exports.findNpmTarball = exports.createNpmPackage = exports.publishNpmPackage = exports.initNpmProject = exports.installNpmPackage = exports.uninstallNpmPackage = exports.installNpmPackageFromOptionalRegistry = exports.installNpmDependencies = exports.isMonorepoPackageRef = exports.determineNpmClient = void 0;
12
+ exports.makeExternals = exports.mergeExternals = exports.makePiletExternals = exports.getPackageVersion = exports.getGitPackageVersion = exports.getFilePackageVersion = exports.getPackageName = exports.combinePackageRef = exports.isLinkedPackage = exports.findPackageRoot = exports.tryResolvePackage = exports.getCurrentPackageDetails = exports.dissectPackageName = exports.makeFilePath = exports.makeGitUrl = exports.isGitPackage = exports.makeNpmAlias = exports.isNpmPackage = exports.isLocalPackage = exports.findLatestVersion = exports.findSpecificVersion = exports.findNpmTarball = exports.createNpmPackage = exports.publishNpmPackage = exports.initNpmProject = exports.installNpmPackage = exports.uninstallNpmPackage = exports.installNpmPackageFromOptionalRegistry = exports.installNpmDependencies = exports.isMonorepoPackageRef = exports.determineNpmClient = void 0;
13
13
  const path_1 = require("path");
14
14
  const fs_1 = require("fs");
15
15
  const log_1 = require("./log");
@@ -22,9 +22,10 @@ const helpers_1 = require("../helpers");
22
22
  const external_1 = require("../external");
23
23
  const gitPrefix = 'git+';
24
24
  const filePrefix = 'file:';
25
+ const npmPrefix = 'npm:';
25
26
  const pathPrefixes = ['/', './', '../', '.\\', '..\\', '~/', '~\\', filePrefix];
26
27
  function isProjectReference(name) {
27
- const target = (0, path_1.resolve)(name, 'package.json');
28
+ const target = (0, path_1.resolve)(name, constants_1.packageJson);
28
29
  return (0, io_1.checkExists)(target);
29
30
  }
30
31
  function resolveAbsPath(basePath, fullName) {
@@ -45,8 +46,8 @@ function detectMonorepoRoot(root) {
45
46
  if (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'pnpm-workspace.yaml'))) {
46
47
  return [root, 'pnpm'];
47
48
  }
48
- const packageJson = yield (0, io_1.readJson)(root, 'package.json');
49
- if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
49
+ const pj = yield (0, io_1.readJson)(root, constants_1.packageJson);
50
+ if (Array.isArray(pj === null || pj === void 0 ? void 0 : pj.workspaces)) {
50
51
  if (yield (0, io_1.checkExists)((0, path_1.resolve)(root, '.pnp.cjs'))) {
51
52
  return [root, 'pnp'];
52
53
  }
@@ -211,6 +212,22 @@ function isLocalPackage(baseDir, fullName) {
211
212
  return false;
212
213
  }
213
214
  exports.isLocalPackage = isLocalPackage;
215
+ function isNpmPackage(fullName) {
216
+ (0, log_1.log)('generalDebug_0003', 'Checking if its an npm alias ...');
217
+ if (fullName) {
218
+ const npmed = fullName.startsWith(npmPrefix);
219
+ if (npmed && fullName.substring(npmPrefix.length + 1).indexOf('@') !== -1) {
220
+ (0, log_1.log)('generalDebug_0003', 'Found an npm package alias by name.');
221
+ return true;
222
+ }
223
+ }
224
+ return false;
225
+ }
226
+ exports.isNpmPackage = isNpmPackage;
227
+ function makeNpmAlias(name, version) {
228
+ return `${npmPrefix}${name}@${version}`;
229
+ }
230
+ exports.makeNpmAlias = makeNpmAlias;
214
231
  function isGitPackage(fullName) {
215
232
  (0, log_1.log)('generalDebug_0003', 'Checking if its a Git package ...');
216
233
  if (fullName) {
@@ -342,7 +359,7 @@ function tryResolvePackage(name, baseDir = undefined) {
342
359
  }
343
360
  exports.tryResolvePackage = tryResolvePackage;
344
361
  function findPackageRoot(pck, baseDir) {
345
- return tryResolvePackage(`${pck}/package.json`, baseDir);
362
+ return tryResolvePackage(`${pck}/${constants_1.packageJson}`, baseDir);
346
363
  }
347
364
  exports.findPackageRoot = findPackageRoot;
348
365
  function isLinkedPackage(name, type, hadVersion, target) {
@@ -365,7 +382,7 @@ function getPackageName(root, name, type) {
365
382
  return __awaiter(this, void 0, void 0, function* () {
366
383
  switch (type) {
367
384
  case 'file':
368
- const originalPackageJson = yield (0, io_1.readJson)(name, 'package.json');
385
+ const originalPackageJson = yield (0, io_1.readJson)(name, constants_1.packageJson);
369
386
  if (!originalPackageJson.name) {
370
387
  const p = (0, path_1.resolve)(process.cwd(), name);
371
388
  try {
@@ -380,7 +397,7 @@ function getPackageName(root, name, type) {
380
397
  }
381
398
  return originalPackageJson.name;
382
399
  case 'git':
383
- const pj = yield (0, io_1.readJson)(root, 'package.json');
400
+ const pj = yield (0, io_1.readJson)(root, constants_1.packageJson);
384
401
  const dd = pj.devDependencies || {};
385
402
  return Object.keys(dd).filter((dep) => dd[dep] === name)[0];
386
403
  case 'registry':
@@ -412,9 +429,9 @@ exports.getPackageVersion = getPackageVersion;
412
429
  function getExternalsFrom(root, packageName) {
413
430
  return __awaiter(this, void 0, void 0, function* () {
414
431
  try {
415
- const target = (0, external_1.getModulePath)(root, `${packageName}/package.json`);
432
+ const target = (0, external_1.getModulePath)(root, `${packageName}/${constants_1.packageJson}`);
416
433
  const dir = (0, path_1.dirname)(target);
417
- const { sharedDependencies } = yield (0, io_1.readJson)(dir, 'package.json');
434
+ const { sharedDependencies } = yield (0, io_1.readJson)(dir, constants_1.packageJson);
418
435
  return sharedDependencies;
419
436
  }
420
437
  catch (err) {
@@ -1 +1 @@
1
- {"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/common/npm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/common/npm.ts"],"names":[],"mappings":"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"}
@@ -40,7 +40,7 @@ export declare function copyScaffoldingFiles(source: string, target: string, fil
40
40
  export declare function copyPiralFiles(root: string, name: string, piralInfo: PiralPackageData, forceOverwrite: ForceOverwrite, variables: Record<string, string>, originalFiles?: Array<FileInfo>): Promise<void>;
41
41
  export declare function getPiletsInfo(piralInfo: Partial<PiralPackageData>): PiletsInfo;
42
42
  export declare function retrievePiralRoot(baseDir: string, entry: string): Promise<string>;
43
- export declare function findDependencyVersion(pckg: Record<string, any>, rootPath: string, packageName: string, parents?: Array<string>): Promise<string>;
43
+ export declare function findDependencyVersion(pckg: Record<string, any>, rootPath: string, dependency: SharedDependency): Promise<string>;
44
44
  export declare function findPackageVersion(rootPath: string, packageName: string | Array<string>): Promise<string>;
45
45
  export declare function flattenExternals(dependencies: Array<SharedDependency>): string[];
46
46
  export declare function retrieveExternals(root: string, packageInfo: any): Promise<Array<SharedDependency>>;
@@ -36,7 +36,9 @@ const npm_1 = require("./npm");
36
36
  const npm_2 = require("./npm");
37
37
  const external_1 = require("../external");
38
38
  const language_1 = require("./language");
39
+ const language_2 = require("./language");
39
40
  const constants_1 = require("./constants");
41
+ const constants_2 = require("./constants");
40
42
  function appendBundler(devDependencies, bundler, proposedVersion) {
41
43
  return __awaiter(this, void 0, void 0, function* () {
42
44
  if (bundler && bundler !== 'none') {
@@ -184,7 +186,7 @@ function patchPiralPackage(root, app, data, version, bundler) {
184
186
  yield (0, io_2.updateExistingJson)(root, 'package.json', pkg);
185
187
  (0, log_1.log)('generalDebug_0003', `Succesfully patched the package.json.`);
186
188
  yield (0, io_2.updateExistingJson)(root, 'piral.json', {
187
- $schema: constants_1.piralJsonSchemaUrl,
189
+ $schema: constants_2.piralJsonSchemaUrl,
188
190
  pilets: getPiletsInfo({}),
189
191
  });
190
192
  (0, log_1.log)('generalDebug_0003', `Succesfully patched the pilet.json.`);
@@ -194,8 +196,8 @@ exports.patchPiralPackage = patchPiralPackage;
194
196
  function getPiralPackage(app, data, version, bundler) {
195
197
  return __awaiter(this, void 0, void 0, function* () {
196
198
  const framework = data.packageName;
197
- const devDependencies = Object.assign(Object.assign({}, (0, language_1.getDevDependencies)(data.language, (0, language_1.getDevDependencyPackages)(framework, data.reactVersion, data.reactRouterVersion))), { 'piral-cli': `${version}` });
198
- const dependencies = Object.assign(Object.assign({}, (0, language_1.getFrameworkDependencies)(framework, version)), (0, language_1.getDependencies)(data.language, (0, language_1.getDependencyPackages)(framework, data.reactVersion, data.reactRouterVersion)));
199
+ const devDependencies = Object.assign(Object.assign({}, (0, language_1.getDevDependencies)(data.language, (0, language_2.getDevDependencyPackages)(framework, data.reactVersion, data.reactRouterVersion))), { 'piral-cli': `${version}` });
200
+ const dependencies = Object.assign(Object.assign({}, (0, language_2.getFrameworkDependencies)(framework, version)), (0, language_1.getDependencies)(data.language, (0, language_1.getDependencyPackages)(framework, data.reactVersion, data.reactRouterVersion)));
199
201
  yield appendBundler(devDependencies, bundler, version);
200
202
  return {
201
203
  app,
@@ -383,28 +385,38 @@ function checkArrayOrUndefined(obj, key) {
383
385
  }
384
386
  return undefined;
385
387
  }
386
- function findDependencyVersion(pckg, rootPath, packageName, parents = []) {
388
+ function findDependencyVersion(pckg, rootPath, dependency) {
387
389
  var _a;
388
- const { devDependencies = {}, dependencies = {} } = pckg;
389
- const desiredVersion = (_a = dependencies[packageName]) !== null && _a !== void 0 ? _a : devDependencies[packageName];
390
- const [parent] = parents;
391
- if (desiredVersion) {
392
- if ((0, npm_1.isGitPackage)(desiredVersion)) {
393
- return Promise.resolve((0, npm_1.makeGitUrl)(desiredVersion));
390
+ return __awaiter(this, void 0, void 0, function* () {
391
+ const { devDependencies = {}, dependencies = {} } = pckg;
392
+ const packageName = dependency.name;
393
+ const desiredVersion = (_a = dependencies[packageName]) !== null && _a !== void 0 ? _a : devDependencies[packageName];
394
+ const [parent] = dependency.parents || [];
395
+ if (desiredVersion) {
396
+ if ((0, npm_1.isNpmPackage)(desiredVersion)) {
397
+ return desiredVersion;
398
+ }
399
+ else if ((0, npm_1.isGitPackage)(desiredVersion)) {
400
+ return (0, npm_1.makeGitUrl)(desiredVersion);
401
+ }
402
+ else if ((0, npm_1.isLocalPackage)(rootPath, desiredVersion)) {
403
+ return (0, npm_1.makeFilePath)(rootPath, desiredVersion);
404
+ }
394
405
  }
395
- else if ((0, npm_1.isLocalPackage)(rootPath, desiredVersion)) {
396
- return Promise.resolve((0, npm_1.makeFilePath)(rootPath, desiredVersion));
406
+ if (parent) {
407
+ // in case the dependency came from another package (= parent)
408
+ // we should start the lookup in its directory (pnpm issue)
409
+ const parentPath = (0, npm_1.tryResolvePackage)(parent, rootPath);
410
+ if (parentPath) {
411
+ rootPath = (0, path_1.dirname)(parentPath);
412
+ }
397
413
  }
398
- }
399
- if (parent) {
400
- // in case the dependency came from another package (= parent)
401
- // we should start the lookup in its directory (pnpm issue)
402
- const parentPath = (0, npm_1.tryResolvePackage)(parent, rootPath);
403
- if (parentPath) {
404
- rootPath = (0, path_1.dirname)(parentPath);
414
+ const version = yield findPackageVersion(rootPath, packageName);
415
+ if (dependency.alias) {
416
+ return (0, npm_2.makeNpmAlias)(dependency.alias, version);
405
417
  }
406
- }
407
- return findPackageVersion(rootPath, packageName);
418
+ return version;
419
+ });
408
420
  }
409
421
  exports.findDependencyVersion = findDependencyVersion;
410
422
  function findPackageVersion(rootPath, packageName) {
@@ -499,7 +511,7 @@ function patchPiletPackage(root, name, version, piralInfo, fromEmulator, newInfo
499
511
  yield (0, io_2.updateExistingJson)(root, 'package.json', pkg);
500
512
  (0, log_1.log)('generalDebug_0003', `Succesfully patched the package.json.`);
501
513
  yield (0, io_2.updateExistingJson)(root, 'pilet.json', {
502
- $schema: constants_1.piletJsonSchemaUrl,
514
+ $schema: constants_2.piletJsonSchemaUrl,
503
515
  piralInstances: {
504
516
  [name]: {},
505
517
  },
@@ -1 +1 @@
1
- {"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"piral-has-valid-externals.js","sourceRoot":"","sources":["../../src/rules/piral-has-valid-externals.ts"],"names":[],"mappings":";;AAKA;;GAEG;AACH,mBAAyB,OAAyB,EAAE,UAAmB,SAAS;IAC9E,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,cAAc,GAAG,SAAS;SAC7B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;SACzD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;SACtB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC;IAE7G,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE;QAC1C,OAAO,CAAC,OAAO,CACb;yBACmB,aAAa;aACzB,aAAa;;CAEzB,CACI,CAAC;KACH;AACH,CAAC;AAhBD,4BAgBC"}
1
+ {"version":3,"file":"piral-has-valid-externals.js","sourceRoot":"","sources":["../../src/rules/piral-has-valid-externals.ts"],"names":[],"mappings":";;AAIA;;GAEG;AACH,mBAAyB,OAAyB,EAAE,UAAmB,SAAS;IAC9E,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,cAAc,GAAG,SAAS;SAC7B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;SACzD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;SACtB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC;IAE7G,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE;QAC1C,OAAO,CAAC,OAAO,CACb;yBACmB,aAAa;aACzB,aAAa;;CAEzB,CACI,CAAC;KACH;AACH,CAAC;AAhBD,4BAgBC"}
@@ -150,6 +150,7 @@ export interface SharedDependency {
150
150
  type: 'local' | 'remote';
151
151
  entry: string;
152
152
  parents?: Array<string>;
153
+ alias?: string;
153
154
  }
154
155
  export interface RuleRunner<T extends RuleContext> {
155
156
  (context: T, options: any): void | Promise<void>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "0.15.9-beta.5415",
3
+ "version": "0.15.9-beta.5420",
4
4
  "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
5
5
  "keywords": [
6
6
  "portal",
@@ -80,5 +80,5 @@
80
80
  "typescript": "^4.0.0",
81
81
  "yargs": "^15.0.0"
82
82
  },
83
- "gitHead": "85149fa812581dc049a38da51944099330f332db"
83
+ "gitHead": "a4b6f7cb2d3285e0d486c7951ad6c3d6484b11f8"
84
84
  }
@@ -1,5 +1,6 @@
1
1
  export const defaultRegistry = 'https://registry.npmjs.org/';
2
2
  export const filesTar = 'files';
3
+ export const packageJson = 'package.json';
3
4
  export const filesOnceTar = 'files_once';
4
5
  export const piralBaseRoot = 'piral-base/package.json';
5
6
  export const frameworkLibs = ['piral-native' as const, 'piral' as const, 'piral-core' as const, 'piral-base' as const];
@@ -1,7 +1,7 @@
1
1
  import { join, resolve, relative } from 'path';
2
2
  import { findDependencyVersion, copyScaffoldingFiles, isValidDependency, flattenExternals } from './package';
3
3
  import { createPiralStubIndexIfNotExists } from './template';
4
- import { filesTar, filesOnceTar } from './constants';
4
+ import { filesTar, filesOnceTar, packageJson } from './constants';
5
5
  import { cliVersion } from './info';
6
6
  import { createNpmPackage } from './npm';
7
7
  import { createPiralDeclaration } from './declaration';
@@ -17,8 +17,6 @@ import {
17
17
  removeAny,
18
18
  } from './io';
19
19
 
20
- const packageJson = 'package.json';
21
-
22
20
  export async function createEmulatorSources(
23
21
  sourceDir: string,
24
22
  externals: Array<SharedDependency>,
@@ -38,7 +36,7 @@ export async function createEmulatorSources(
38
36
  .filter((ext) => ext.type === 'local' && isValidDependency(ext.name))
39
37
  .map(async (external) => ({
40
38
  name: external.name,
41
- version: await findDependencyVersion(piralPkg, sourceDir, external.name, external.parents),
39
+ version: await findDependencyVersion(piralPkg, sourceDir, external),
42
40
  })),
43
41
  );
44
42
  const externalDependencies = externalPackages.reduce((deps, dep) => {
@@ -8,6 +8,28 @@ import { SharedDependency, Importmap } from '../types';
8
8
 
9
9
  const shorthandsUrls = ['', '.', '...'];
10
10
 
11
+ function addLocalDependencies(
12
+ dependencies: Array<SharedDependency>,
13
+ realIdentifier: string,
14
+ identifier: string,
15
+ version: string,
16
+ requireVersion: string,
17
+ entry: string,
18
+ assetName: string,
19
+ ) {
20
+ const alias = realIdentifier !== identifier ? realIdentifier : undefined;
21
+
22
+ dependencies.push({
23
+ id: `${identifier}@${version}`,
24
+ requireId: `${identifier}@${requireVersion}`,
25
+ entry,
26
+ name: identifier,
27
+ ref: `${assetName}.js`,
28
+ type: 'local',
29
+ alias,
30
+ });
31
+ }
32
+
11
33
  function getDependencyDetails(depName: string): [assetName: string, identifier: string, versionSpec: string] {
12
34
  const sep = depName.indexOf('@', 1);
13
35
  const version = sep > 0 ? depName.substring(sep + 1) : '';
@@ -20,7 +42,7 @@ async function getLocalDependencyVersion(
20
42
  packageJson: string,
21
43
  depName: string,
22
44
  versionSpec: string,
23
- ): Promise<[offeredVersion: string, requiredVersion: string]> {
45
+ ): Promise<[realIdentifier: string, offeredVersion: string, requiredVersion: string]> {
24
46
  const packageDir = dirname(packageJson);
25
47
  const packageFile = basename(packageJson);
26
48
  const details = await readJson(packageDir, packageFile);
@@ -34,10 +56,10 @@ async function getLocalDependencyVersion(
34
56
  fail('importMapVersionSpecNotSatisfied_0025', depName, details.version);
35
57
  }
36
58
 
37
- return [details.version, versionSpec];
59
+ return [details.name, details.version, versionSpec];
38
60
  }
39
61
 
40
- return [details.version, details.version];
62
+ return [details.name, details.version, details.version];
41
63
  }
42
64
 
43
65
  async function getInheritedDependencies(inheritedImport: string, dir: string): Promise<Array<SharedDependency>> {
@@ -88,16 +110,13 @@ async function resolveImportmap(dir: string, importmap: Importmap): Promise<Arra
88
110
 
89
111
  if (entry) {
90
112
  const packageJson = await findFile(dirname(entry), 'package.json');
91
- const [version, requireVersion] = await getLocalDependencyVersion(packageJson, depName, versionSpec);
113
+ const [realIdentifier, version, requireVersion] = await getLocalDependencyVersion(
114
+ packageJson,
115
+ depName,
116
+ versionSpec,
117
+ );
92
118
 
93
- dependencies.push({
94
- id: `${identifier}@${version}`,
95
- requireId: `${identifier}@${requireVersion}`,
96
- entry,
97
- name: identifier,
98
- ref: `${assetName}.js`,
99
- type: 'local',
100
- });
119
+ addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, entry, assetName);
101
120
  } else {
102
121
  fail('importMapReferenceNotFound_0027', dir, identifier);
103
122
  }
@@ -106,16 +125,13 @@ async function resolveImportmap(dir: string, importmap: Importmap): Promise<Arra
106
125
 
107
126
  if (entry) {
108
127
  const packageJson = await findFile(dirname(entry), 'package.json');
109
- const [version, requireVersion] = await getLocalDependencyVersion(packageJson, depName, versionSpec);
128
+ const [realIdentifier, version, requireVersion] = await getLocalDependencyVersion(
129
+ packageJson,
130
+ depName,
131
+ versionSpec,
132
+ );
110
133
 
111
- dependencies.push({
112
- id: `${identifier}@${version}`,
113
- requireId: `${identifier}@${requireVersion}`,
114
- entry,
115
- name: identifier,
116
- ref: `${assetName}.js`,
117
- type: 'local',
118
- });
134
+ addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, entry, assetName);
119
135
  } else {
120
136
  fail('importMapReferenceNotFound_0027', dir, url);
121
137
  }
@@ -131,16 +147,21 @@ async function resolveImportmap(dir: string, importmap: Importmap): Promise<Arra
131
147
  const packageJsonExists = await checkExists(packageJson);
132
148
 
133
149
  if (packageJsonExists) {
134
- const [version, requireVersion] = await getLocalDependencyVersion(packageJson, depName, versionSpec);
135
-
136
- dependencies.push({
137
- id: `${identifier}@${version}`,
138
- requireId: `${identifier}@${requireVersion}`,
139
- entry: isDirectory ? tryResolvePackage(entry, dir) : entry,
140
- name: identifier,
141
- ref: `${assetName}.js`,
142
- type: 'local',
143
- });
150
+ const [realIdentifier, version, requireVersion] = await getLocalDependencyVersion(
151
+ packageJson,
152
+ depName,
153
+ versionSpec,
154
+ );
155
+
156
+ addLocalDependencies(
157
+ dependencies,
158
+ realIdentifier,
159
+ identifier,
160
+ version,
161
+ requireVersion,
162
+ isDirectory ? tryResolvePackage(entry, dir) : entry,
163
+ assetName,
164
+ );
144
165
  } else if (isDirectory) {
145
166
  fail('importMapReferenceNotFound_0027', entry, 'package.json');
146
167
  } else {
package/src/common/npm.ts CHANGED
@@ -3,7 +3,7 @@ import { createReadStream, existsSync } from 'fs';
3
3
  import { log, fail } from './log';
4
4
  import { clients, detectClients, isWrapperClient } from './clients';
5
5
  import { config } from './config';
6
- import { legacyCoreExternals, frameworkLibs, defaultRegistry } from './constants';
6
+ import { legacyCoreExternals, frameworkLibs, defaultRegistry, packageJson } from './constants';
7
7
  import { inspectPackage } from './inspect';
8
8
  import { readJson, checkExists } from './io';
9
9
  import { clientTypeKeys } from '../helpers';
@@ -12,10 +12,11 @@ import { PackageType, NpmClientType } from '../types';
12
12
 
13
13
  const gitPrefix = 'git+';
14
14
  const filePrefix = 'file:';
15
+ const npmPrefix = 'npm:';
15
16
  const pathPrefixes = ['/', './', '../', '.\\', '..\\', '~/', '~\\', filePrefix];
16
17
 
17
18
  function isProjectReference(name: string) {
18
- const target = resolve(name, 'package.json');
19
+ const target = resolve(name, packageJson);
19
20
  return checkExists(target);
20
21
  }
21
22
 
@@ -41,9 +42,9 @@ async function detectMonorepoRoot(root: string): Promise<[] | [string, NpmClient
41
42
  return [root, 'pnpm'];
42
43
  }
43
44
 
44
- const packageJson = await readJson(root, 'package.json');
45
+ const pj = await readJson(root, packageJson);
45
46
 
46
- if (Array.isArray(packageJson?.workspaces)) {
47
+ if (Array.isArray(pj?.workspaces)) {
47
48
  if (await checkExists(resolve(root, '.pnp.cjs'))) {
48
49
  return [root, 'pnp'];
49
50
  }
@@ -245,6 +246,25 @@ export function isLocalPackage(baseDir: string, fullName: string) {
245
246
  return false;
246
247
  }
247
248
 
249
+ export function isNpmPackage(fullName: string) {
250
+ log('generalDebug_0003', 'Checking if its an npm alias ...');
251
+
252
+ if (fullName) {
253
+ const npmed = fullName.startsWith(npmPrefix);
254
+
255
+ if (npmed && fullName.substring(npmPrefix.length + 1).indexOf('@') !== -1) {
256
+ log('generalDebug_0003', 'Found an npm package alias by name.');
257
+ return true;
258
+ }
259
+ }
260
+
261
+ return false;
262
+ }
263
+
264
+ export function makeNpmAlias(name: string, version: string) {
265
+ return `${npmPrefix}${name}@${version}`;
266
+ }
267
+
248
268
  export function isGitPackage(fullName: string) {
249
269
  log('generalDebug_0003', 'Checking if its a Git package ...');
250
270
 
@@ -391,7 +411,7 @@ export function tryResolvePackage(name: string, baseDir: string = undefined) {
391
411
  }
392
412
 
393
413
  export function findPackageRoot(pck: string, baseDir: string) {
394
- return tryResolvePackage(`${pck}/package.json`, baseDir);
414
+ return tryResolvePackage(`${pck}/${packageJson}`, baseDir);
395
415
  }
396
416
 
397
417
  export function isLinkedPackage(name: string, type: PackageType, hadVersion: boolean, target: string) {
@@ -415,7 +435,7 @@ export function combinePackageRef(name: string, version: string, type: PackageTy
415
435
  export async function getPackageName(root: string, name: string, type: PackageType): Promise<string> {
416
436
  switch (type) {
417
437
  case 'file':
418
- const originalPackageJson = await readJson(name, 'package.json');
438
+ const originalPackageJson = await readJson(name, packageJson);
419
439
 
420
440
  if (!originalPackageJson.name) {
421
441
  const p = resolve(process.cwd(), name);
@@ -432,7 +452,7 @@ export async function getPackageName(root: string, name: string, type: PackageTy
432
452
 
433
453
  return originalPackageJson.name;
434
454
  case 'git':
435
- const pj = await readJson(root, 'package.json');
455
+ const pj = await readJson(root, packageJson);
436
456
  const dd = pj.devDependencies || {};
437
457
  return Object.keys(dd).filter((dep) => dd[dep] === name)[0];
438
458
  case 'registry':
@@ -468,9 +488,9 @@ export function getPackageVersion(
468
488
 
469
489
  async function getExternalsFrom(root: string, packageName: string): Promise<Array<string> | undefined> {
470
490
  try {
471
- const target = getModulePath(root, `${packageName}/package.json`);
491
+ const target = getModulePath(root, `${packageName}/${packageJson}`);
472
492
  const dir = dirname(target);
473
- const { sharedDependencies } = await readJson(dir, 'package.json');
493
+ const { sharedDependencies } = await readJson(dir, packageJson);
474
494
  return sharedDependencies;
475
495
  } catch (err) {
476
496
  log('generalError_0002', `Could not get externals from "${packageName}": "${err}`);
@@ -9,25 +9,13 @@ import { onlyUnique } from './utils';
9
9
  import { readImportmap } from './importmap';
10
10
  import { getHash, checkIsDirectory, matchFiles } from './io';
11
11
  import { readJson, copy, updateExistingJson, findFile, checkExists } from './io';
12
- import { isGitPackage, isLocalPackage, makeGitUrl, makeFilePath, tryResolvePackage } from './npm';
13
- import { makePiletExternals, makeExternals, findPackageRoot, findSpecificVersion } from './npm';
12
+ import { isGitPackage, isLocalPackage, makeGitUrl, makeFilePath, tryResolvePackage, isNpmPackage } from './npm';
13
+ import { makePiletExternals, makeExternals, findPackageRoot, findSpecificVersion, makeNpmAlias } from './npm';
14
14
  import { getModulePath } from '../external';
15
- import {
16
- getDependencies,
17
- getDependencyPackages,
18
- getDevDependencies,
19
- getDevDependencyPackages,
20
- getFrameworkDependencies,
21
- } from './language';
22
- import {
23
- filesTar,
24
- filesOnceTar,
25
- declarationEntryExtensions,
26
- bundlerNames,
27
- piralJsonSchemaUrl,
28
- piletJsonSchemaUrl,
29
- frameworkLibs,
30
- } from './constants';
15
+ import { getDependencies, getDependencyPackages, getDevDependencies } from './language';
16
+ import { getDevDependencyPackages, getFrameworkDependencies } from './language';
17
+ import { filesTar, filesOnceTar, declarationEntryExtensions, bundlerNames, frameworkLibs } from './constants';
18
+ import { piralJsonSchemaUrl, piletJsonSchemaUrl } from './constants';
31
19
  import {
32
20
  SourceLanguage,
33
21
  Framework,
@@ -498,21 +486,23 @@ function checkArrayOrUndefined(obj: Record<string, any>, key: string) {
498
486
  return undefined;
499
487
  }
500
488
 
501
- export function findDependencyVersion(
489
+ export async function findDependencyVersion(
502
490
  pckg: Record<string, any>,
503
491
  rootPath: string,
504
- packageName: string,
505
- parents: Array<string> = [],
492
+ dependency: SharedDependency,
506
493
  ): Promise<string> {
507
494
  const { devDependencies = {}, dependencies = {} } = pckg;
495
+ const packageName = dependency.name;
508
496
  const desiredVersion = dependencies[packageName] ?? devDependencies[packageName];
509
- const [parent] = parents;
497
+ const [parent] = dependency.parents || [];
510
498
 
511
499
  if (desiredVersion) {
512
- if (isGitPackage(desiredVersion)) {
513
- return Promise.resolve(makeGitUrl(desiredVersion));
500
+ if (isNpmPackage(desiredVersion)) {
501
+ return desiredVersion;
502
+ } else if (isGitPackage(desiredVersion)) {
503
+ return makeGitUrl(desiredVersion);
514
504
  } else if (isLocalPackage(rootPath, desiredVersion)) {
515
- return Promise.resolve(makeFilePath(rootPath, desiredVersion));
505
+ return makeFilePath(rootPath, desiredVersion);
516
506
  }
517
507
  }
518
508
 
@@ -526,7 +516,13 @@ export function findDependencyVersion(
526
516
  }
527
517
  }
528
518
 
529
- return findPackageVersion(rootPath, packageName);
519
+ const version = await findPackageVersion(rootPath, packageName);
520
+
521
+ if (dependency.alias) {
522
+ return makeNpmAlias(dependency.alias, version);
523
+ }
524
+
525
+ return version;
530
526
  }
531
527
 
532
528
  export async function findPackageVersion(rootPath: string, packageName: string | Array<string>): Promise<string> {
@@ -1,4 +1,3 @@
1
- import { findDependencyVersion } from '../common';
2
1
  import { PiralRuleContext } from '../types';
3
2
 
4
3
  export type Options = void;
@@ -167,6 +167,7 @@ export interface SharedDependency {
167
167
  type: 'local' | 'remote';
168
168
  entry: string;
169
169
  parents?: Array<string>;
170
+ alias?: string;
170
171
  }
171
172
 
172
173
  export interface RuleRunner<T extends RuleContext> {