piral-cli 0.15.10-beta.5463 → 0.15.10-beta.5491

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.
@@ -6,6 +6,6 @@ export interface PostFormResult {
6
6
  success: boolean;
7
7
  response?: object;
8
8
  }
9
- export declare type FormDataObj = Record<string, string | [Buffer, string]>;
9
+ export declare type FormDataObj = Record<string, string | number | boolean | [Buffer, string]>;
10
10
  export declare function postForm(target: string, scheme: PiletPublishScheme, key: string, formData: FormDataObj, customHeaders?: Record<string, string>, ca?: Buffer, interactive?: boolean): Promise<PostFormResult>;
11
11
  export declare function postFile(target: string, scheme: PiletPublishScheme, key: string, file: Buffer, customFields?: Record<string, string>, customHeaders?: Record<string, string>, ca?: Buffer, interactive?: boolean): Promise<PostFormResult>;
@@ -62,12 +62,15 @@ function postForm(target, scheme, key, formData, customHeaders = {}, ca, interac
62
62
  const form = new external_1.FormData();
63
63
  Object.keys(formData).forEach((key) => {
64
64
  const value = formData[key];
65
- if (typeof value === 'string') {
65
+ if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
66
66
  form.append(key, value);
67
67
  }
68
- else {
68
+ else if (Array.isArray(value)) {
69
69
  form.append(key, value[0], value[1]);
70
70
  }
71
+ else {
72
+ // unknown value - skip for now
73
+ }
71
74
  });
72
75
  const headers = Object.assign(Object.assign(Object.assign({}, form.getHeaders()), info_1.standardHeaders), customHeaders);
73
76
  if (key) {
@@ -1 +1 @@
1
- {"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/common/http.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/common/http.ts"],"names":[],"mappings":"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"}
@@ -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 {
@@ -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;AA/BD,4CA+BC"}
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"}
@@ -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.5463",
3
+ "version": "0.15.10-beta.5491",
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": "49f28a0509531a5f15c763f1d66a4aeb7b8e823f"
83
+ "gitHead": "3ee67d02efb34989f4642076e302e0813d28bcc1"
84
84
  }
@@ -63,7 +63,7 @@ export interface PostFormResult {
63
63
  response?: object;
64
64
  }
65
65
 
66
- export type FormDataObj = Record<string, string | [Buffer, string]>;
66
+ export type FormDataObj = Record<string, string | number | boolean | [Buffer, string]>;
67
67
 
68
68
  export function postForm(
69
69
  target: string,
@@ -80,10 +80,12 @@ export function postForm(
80
80
  Object.keys(formData).forEach((key) => {
81
81
  const value = formData[key];
82
82
 
83
- if (typeof value === 'string') {
83
+ if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
84
84
  form.append(key, value);
85
- } else {
85
+ } else if (Array.isArray(value)) {
86
86
  form.append(key, value[0], value[1]);
87
+ } else {
88
+ // unknown value - skip for now
87
89
  }
88
90
  });
89
91
 
@@ -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 {
@@ -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