piral-cli 0.15.10-beta.5463 → 0.15.10-beta.5490
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.
- package/lib/common/spec.js +10 -0
- package/lib/common/spec.js.map +1 -1
- package/lib/types/public.d.ts +1 -1
- package/package.json +2 -2
- package/src/common/spec.ts +9 -0
- package/src/types/public.ts +1 -1
package/lib/common/spec.js
CHANGED
|
@@ -5,6 +5,7 @@ const fs_1 = require("fs");
|
|
|
5
5
|
const hash_1 = require("./hash");
|
|
6
6
|
const checkV1 = /^\/\/\s*@pilet\s+v:1\s*\(([A-Za-z0-9\_\:\-]+)\)/;
|
|
7
7
|
const checkV2 = /^\/\/\s*@pilet\s+v:2\s*(?:\(([A-Za-z0-9\_\:\-]+),\s*(.*)\))?/;
|
|
8
|
+
const checkV3 = /^\/\/\s*@pilet\s+v:3\s*(?:\(([A-Za-z0-9\_\:\-]+),\s*(.*)\))?/;
|
|
8
9
|
const isUrl = /^https?:\/\//;
|
|
9
10
|
function getDependencies(deps, basePath) {
|
|
10
11
|
try {
|
|
@@ -44,6 +45,15 @@ function getPiletSpecMeta(target, basePath) {
|
|
|
44
45
|
dependencies: getDependencies(plainDependencies, basePath),
|
|
45
46
|
};
|
|
46
47
|
}
|
|
48
|
+
else if (checkV3.test(content)) {
|
|
49
|
+
// uses two arguments; requireRef and dependencies as JSON (required)
|
|
50
|
+
const [, requireRef, plainDependencies] = checkV3.exec(content);
|
|
51
|
+
return {
|
|
52
|
+
spec: 'v3',
|
|
53
|
+
requireRef,
|
|
54
|
+
dependencies: getDependencies(plainDependencies, basePath),
|
|
55
|
+
};
|
|
56
|
+
}
|
|
47
57
|
else {
|
|
48
58
|
// uses no arguments
|
|
49
59
|
return {
|
package/lib/common/spec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spec.js","sourceRoot":"","sources":["../../src/common/spec.ts"],"names":[],"mappings":";;;AAAA,2BAAwD;AACxD,iCAAuD;AAEvD,MAAM,OAAO,GAAG,iDAAiD,CAAC;AAClE,MAAM,OAAO,GAAG,8DAA8D,CAAC;AAC/E,MAAM,KAAK,GAAG,cAAc,CAAC;AAE7B,SAAS,eAAe,CAAC,IAAY,EAAE,QAAgB;IACrD,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YACxC,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;gBACjD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;gBAE/B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;oBAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,MAAM,EAAE,CAAC;oBACjE,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;iBACpB;gBAED,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;SACR;KACF;IAAC,WAAM,GAAE;IAEV,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAc,EAAE,QAAgB;IAC/D,IAAI,IAAA,eAAU,EAAC,MAAM,CAAC,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE7C,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACzB,8CAA8C;YAC9C,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,UAAU;gBACV,SAAS,EAAE,IAAA,uBAAgB,EAAC,OAAO,CAAC;aACrC,CAAC;SACH;aAAM,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAChC,qEAAqE;YACrE,MAAM,CAAC,EAAE,UAAU,EAAE,iBAAiB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAChE,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,UAAU;gBACV,YAAY,EAAE,eAAe,CAAC,iBAAiB,EAAE,QAAQ,CAAC;aAC3D,CAAC;SACH;aAAM;YACL,oBAAoB;YACpB,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAA,kBAAW,EAAC,OAAO,CAAC;gBAC1B,OAAO,EAAE,IAAI;aACd,CAAC;SACH;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;
|
|
1
|
+
{"version":3,"file":"spec.js","sourceRoot":"","sources":["../../src/common/spec.ts"],"names":[],"mappings":";;;AAAA,2BAAwD;AACxD,iCAAuD;AAEvD,MAAM,OAAO,GAAG,iDAAiD,CAAC;AAClE,MAAM,OAAO,GAAG,8DAA8D,CAAC;AAC/E,MAAM,OAAO,GAAG,8DAA8D,CAAC;AAC/E,MAAM,KAAK,GAAG,cAAc,CAAC;AAE7B,SAAS,eAAe,CAAC,IAAY,EAAE,QAAgB;IACrD,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YACxC,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;gBACjD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;gBAE/B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;oBAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,MAAM,EAAE,CAAC;oBACjE,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;iBACpB;gBAED,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;SACR;KACF;IAAC,WAAM,GAAE;IAEV,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAc,EAAE,QAAgB;IAC/D,IAAI,IAAA,eAAU,EAAC,MAAM,CAAC,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE7C,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACzB,8CAA8C;YAC9C,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,UAAU;gBACV,SAAS,EAAE,IAAA,uBAAgB,EAAC,OAAO,CAAC;aACrC,CAAC;SACH;aAAM,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAChC,qEAAqE;YACrE,MAAM,CAAC,EAAE,UAAU,EAAE,iBAAiB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAChE,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,UAAU;gBACV,YAAY,EAAE,eAAe,CAAC,iBAAiB,EAAE,QAAQ,CAAC;aAC3D,CAAC;SACH;aAAM,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAChC,qEAAqE;YACrE,MAAM,CAAC,EAAE,UAAU,EAAE,iBAAiB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAChE,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,UAAU;gBACV,YAAY,EAAE,eAAe,CAAC,iBAAiB,EAAE,QAAQ,CAAC;aAC3D,CAAC;SACH;aAAM;YACL,oBAAoB;YACpB,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAA,kBAAW,EAAC,OAAO,CAAC;gBAC1B,OAAO,EAAE,IAAI;aACd,CAAC;SACH;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAvCD,4CAuCC"}
|
package/lib/types/public.d.ts
CHANGED
|
@@ -191,7 +191,7 @@ export interface BundlerDefinition {
|
|
|
191
191
|
debugPilet: DebugPiletBundlerDefinition;
|
|
192
192
|
buildPilet: BuildPiletBundlerDefinition;
|
|
193
193
|
}
|
|
194
|
-
export declare type PiletSchemaVersion = 'none' | 'v0' | 'v1' | 'v2';
|
|
194
|
+
export declare type PiletSchemaVersion = 'none' | 'v0' | 'v1' | 'v2' | 'v3';
|
|
195
195
|
export declare type SourceLanguage = 'js' | 'ts';
|
|
196
196
|
export declare type PiletPublishScheme = 'none' | 'digest' | 'bearer' | 'basic';
|
|
197
197
|
export declare type PiletPublishSource = 'local' | 'npm' | 'remote';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "0.15.10-beta.
|
|
3
|
+
"version": "0.15.10-beta.5490",
|
|
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": "
|
|
83
|
+
"gitHead": "c275a93204a80a1a8fbc40c266e9256982eedbc5"
|
|
84
84
|
}
|
package/src/common/spec.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { computeHash, computeIntegrity } from './hash';
|
|
|
3
3
|
|
|
4
4
|
const checkV1 = /^\/\/\s*@pilet\s+v:1\s*\(([A-Za-z0-9\_\:\-]+)\)/;
|
|
5
5
|
const checkV2 = /^\/\/\s*@pilet\s+v:2\s*(?:\(([A-Za-z0-9\_\:\-]+),\s*(.*)\))?/;
|
|
6
|
+
const checkV3 = /^\/\/\s*@pilet\s+v:3\s*(?:\(([A-Za-z0-9\_\:\-]+),\s*(.*)\))?/;
|
|
6
7
|
const isUrl = /^https?:\/\//;
|
|
7
8
|
|
|
8
9
|
function getDependencies(deps: string, basePath: string) {
|
|
@@ -46,6 +47,14 @@ export function getPiletSpecMeta(target: string, basePath: string) {
|
|
|
46
47
|
requireRef,
|
|
47
48
|
dependencies: getDependencies(plainDependencies, basePath),
|
|
48
49
|
};
|
|
50
|
+
} else if (checkV3.test(content)) {
|
|
51
|
+
// uses two arguments; requireRef and dependencies as JSON (required)
|
|
52
|
+
const [, requireRef, plainDependencies] = checkV3.exec(content);
|
|
53
|
+
return {
|
|
54
|
+
spec: 'v3',
|
|
55
|
+
requireRef,
|
|
56
|
+
dependencies: getDependencies(plainDependencies, basePath),
|
|
57
|
+
};
|
|
49
58
|
} else {
|
|
50
59
|
// uses no arguments
|
|
51
60
|
return {
|
package/src/types/public.ts
CHANGED
|
@@ -219,7 +219,7 @@ export interface BundlerDefinition {
|
|
|
219
219
|
buildPilet: BuildPiletBundlerDefinition;
|
|
220
220
|
}
|
|
221
221
|
|
|
222
|
-
export type PiletSchemaVersion = 'none' | 'v0' | 'v1' | 'v2';
|
|
222
|
+
export type PiletSchemaVersion = 'none' | 'v0' | 'v1' | 'v2' | 'v3';
|
|
223
223
|
|
|
224
224
|
export type SourceLanguage = 'js' | 'ts';
|
|
225
225
|
|