@kintone/dts-gen 6.1.33 → 7.0.1
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/dist/cli-parser.d.ts +1 -2
- package/dist/cli-parser.js +5 -6
- package/dist/cli-parser.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/templates/converter.d.ts +2 -6
- package/dist/templates/converter.js +3 -3
- package/dist/templates/converter.js.map +1 -1
- package/dist/templates/expressions/namespace.d.ts +3 -3
- package/dist/templates/expressions/namespace.js +5 -5
- package/dist/templates/template.d.ts +1 -2
- package/dist/templates/template.js +8 -1
- package/dist/templates/template.js.map +1 -1
- package/dist/validators/__tests__/args.test.d.ts +1 -0
- package/dist/validators/__tests__/args.test.js +92 -0
- package/dist/validators/__tests__/args.test.js.map +1 -0
- package/dist/validators/args.d.ts +2 -0
- package/dist/validators/args.js +28 -0
- package/dist/validators/args.js.map +1 -0
- package/package.json +7 -7
package/dist/cli-parser.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
interface ParsedArgs {
|
|
1
|
+
export interface ParsedArgs {
|
|
2
2
|
baseUrl: string;
|
|
3
3
|
username: string | null;
|
|
4
4
|
password: string | null;
|
|
@@ -16,4 +16,3 @@ interface ParsedArgs {
|
|
|
16
16
|
output: string;
|
|
17
17
|
}
|
|
18
18
|
export declare const parse: (argv: string[]) => ParsedArgs;
|
|
19
|
-
export {};
|
package/dist/cli-parser.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parse = void 0;
|
|
4
4
|
const commander_1 = require("commander");
|
|
5
|
+
const args_1 = require("./validators/args");
|
|
5
6
|
const parse = (argv) => {
|
|
6
7
|
const program = new commander_1.Command();
|
|
7
8
|
program
|
|
@@ -24,12 +25,8 @@ const parse = (argv) => {
|
|
|
24
25
|
.option("-o, --output [output]", "output file name", "fields.d.ts")
|
|
25
26
|
.parse(argv);
|
|
26
27
|
const options = program.opts();
|
|
27
|
-
const { username, password, apiToken, oauthToken, proxy, basicAuthPassword, basicAuthUsername, appId, preview, guestSpaceId, demo, typeName, namespace, output, } = options;
|
|
28
|
-
const
|
|
29
|
-
if (baseUrl === null) {
|
|
30
|
-
throw new Error("--base-url (KINTONE_BASE_URL) must be specified");
|
|
31
|
-
}
|
|
32
|
-
return {
|
|
28
|
+
const { baseUrl, username, password, apiToken, oauthToken, proxy, basicAuthPassword, basicAuthUsername, appId, preview, guestSpaceId, demo, typeName, namespace, output, } = options;
|
|
29
|
+
const parsedArgs = {
|
|
33
30
|
baseUrl,
|
|
34
31
|
username,
|
|
35
32
|
password,
|
|
@@ -46,6 +43,8 @@ const parse = (argv) => {
|
|
|
46
43
|
namespace,
|
|
47
44
|
output,
|
|
48
45
|
};
|
|
46
|
+
(0, args_1.validateArgs)(parsedArgs);
|
|
47
|
+
return parsedArgs;
|
|
49
48
|
};
|
|
50
49
|
exports.parse = parse;
|
|
51
50
|
//# sourceMappingURL=cli-parser.js.map
|
package/dist/cli-parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-parser.js","sourceRoot":"","sources":["../src/cli-parser.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;
|
|
1
|
+
{"version":3,"file":"cli-parser.js","sourceRoot":"","sources":["../src/cli-parser.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AACpC,4CAAiD;AAoB1C,MAAM,KAAK,GAAG,CAAC,IAAc,EAAc,EAAE;IAClD,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;IAC9B,OAAO;SACJ,MAAM,CAAC,QAAQ,EAAE,0CAA0C,EAAE,KAAK,CAAC;SACnE,MAAM,CACL,sBAAsB,EACtB,wCAAwC,EACxC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,IAAI,CACrC;SACA,MAAM,CACL,2BAA2B,EAC3B,wCAAwC,EACxC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,IAAI,CACrC;SACA,MAAM,CACL,2BAA2B,EAC3B,wCAAwC,EACxC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,IAAI,CACrC;SACA,MAAM,CACL,wBAAwB,EACxB,0CAA0C,EAC1C,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,IAAI,CACtC;SACA,MAAM,CACL,4BAA4B,EAC5B,4CAA4C,EAC5C,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CACxC;SACA,MAAM,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,IAAI,CAAC;SACrD,MAAM,CACL,iCAAiC,EACjC,8BAA8B,EAC9B,IAAI,CACL;SACA,MAAM,CACL,WAAW,EACX,mDAAmD,EACnD,KAAK,CACN;SACA,MAAM,CAAC,wBAAwB,EAAE,2BAA2B,EAAE,QAAQ,CAAC;SACvE,MAAM,CACL,yBAAyB,EACzB,mCAAmC,EACnC,eAAe,CAChB;QACD,qDAAqD;QACrD,iEAAiE;SAChE,MAAM,CAAC,iBAAiB,EAAE,cAAc,EAAE,IAAI,CAAC;SAC/C,MAAM,CACL,2CAA2C,EAC3C,qCAAqC,EACrC,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,IAAI,CAChD;SACA,MAAM,CACL,2CAA2C,EAC3C,qCAAqC,EACrC,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,IAAI,CAChD;SACA,MAAM,CAAC,uBAAuB,EAAE,kBAAkB,EAAE,aAAa,CAAC;SAClE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEf,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC/B,MAAM,EACJ,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,KAAK,EACL,iBAAiB,EACjB,iBAAiB,EACjB,KAAK,EACL,OAAO,EACP,YAAY,EACZ,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,MAAM,GACP,GAAG,OAAO,CAAC;IAEZ,MAAM,UAAU,GAAe;QAC7B,OAAO;QACP,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,UAAU,EAAE,UAAU;QACtB,KAAK;QACL,iBAAiB;QACjB,iBAAiB;QACjB,KAAK;QACL,OAAO;QACP,YAAY;QACZ,IAAI;QACJ,QAAQ;QACR,SAAS;QACT,MAAM;KACP,CAAC;IAEF,IAAA,mBAAY,EAAC,UAAU,CAAC,CAAC;IAEzB,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAtGW,QAAA,KAAK,SAsGhB"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,2EAAsE;AACtE,+DAA2D;AAC3D,4EAAuE;AACvE,mDAA8D;AAC9D,uDAAoD;AACpD,6CAAqC;AAErC,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE;IACpC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACzB,2CAA2C;IAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,MAAM,IAAI,GAAG,IAAA,kBAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEjC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,wBAAU,EAAE,CAAC,CAAC,CAAC,IAAI,mCAAe,CAAC,IAAI,CAAC,CAAC;AAExE,MAAM,wBAAwB,GAAG;IAC/B,KAAK,EAAE,IAAI,CAAC,KAAK;IACjB,YAAY,EAAE,IAAI,CAAC,YAAY;IAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;CACtB,CAAC;AAEF,MAAM,OAAO,GAAG,GAAS,EAAE;IACzB,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,CAAC;IAC9E,MAAM,eAAe,GAAG,yCAAkB,CAAC,kCAAkC,CAC3E,IAAA,2BAAY,EAAC,UAAU,CAAC,CACzB,CAAC;IACF,MAAM,KAAK,GAAgB;QACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,eAAe;KAChB,CAAC;IACF,MAAM,iCAAsB,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAChE,CAAC,CAAA,CAAC;AAEF,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACtB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,2CAA2C;IAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { RenderInput } from "./template";
|
|
2
2
|
import { Namespace } from "./expressions/namespace";
|
|
3
|
-
export declare const convertToTsExpression: ({ namespace, typeName, fieldTypeGroups, }:
|
|
4
|
-
namespace: string;
|
|
5
|
-
typeName: string;
|
|
6
|
-
fieldTypeGroups: FieldTypeGroups;
|
|
7
|
-
}) => Namespace;
|
|
3
|
+
export declare const convertToTsExpression: ({ namespace, typeName, fieldTypeGroups, }: RenderInput) => Namespace;
|
|
@@ -30,11 +30,11 @@ const typedefinitions_1 = require("./expressions/typedefinitions");
|
|
|
30
30
|
const convertToTsExpression = ({ namespace, typeName, fieldTypeGroups, }) => {
|
|
31
31
|
const fieldGroup = convertToFieldGroup(fieldTypeGroups);
|
|
32
32
|
const subTableFields = fieldTypeGroups.subTableFields.map((f) => new F.SubTableField(f.code, f.type, convertToFieldGroup(f.fields)));
|
|
33
|
-
const
|
|
33
|
+
const typeDefinition = new typedefinitions_1.TypeDefinition(typeName, fieldGroup, subTableFields);
|
|
34
34
|
const userFields = fieldTypeGroups.userFieldsInSavedRecord.map((f) => new F.TsDefinedField(f.code, f.type));
|
|
35
35
|
const stringFieldsInSavedRecord = fieldTypeGroups.stringFieldsInSavedRecord.map((f) => new F.TsDefinedField(f.code, f.type));
|
|
36
|
-
const
|
|
37
|
-
return new namespace_1.Namespace(namespace,
|
|
36
|
+
const savedTypeDefinition = new typedefinitions_1.SavedTypeDefinition(typeName, userFields, stringFieldsInSavedRecord);
|
|
37
|
+
return new namespace_1.Namespace(namespace, typeDefinition, savedTypeDefinition);
|
|
38
38
|
};
|
|
39
39
|
exports.convertToTsExpression = convertToTsExpression;
|
|
40
40
|
const convertToFieldGroup = (input) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../src/templates/converter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAA0C;AAC1C,uDAAoD;AACpD,mEAGuC;AAGhC,MAAM,qBAAqB,GAAG,CAAC,EACpC,SAAS,EACT,QAAQ,EACR,eAAe,
|
|
1
|
+
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../src/templates/converter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAA0C;AAC1C,uDAAoD;AACpD,mEAGuC;AAGhC,MAAM,qBAAqB,GAAG,CAAC,EACpC,SAAS,EACT,QAAQ,EACR,eAAe,GACH,EAAa,EAAE;IAC3B,MAAM,UAAU,GAAG,mBAAmB,CAAC,eAAe,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC,GAAG,CACvD,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAC1E,CAAC;IAEF,MAAM,cAAc,GAAG,IAAI,gCAAc,CACvC,QAAQ,EACR,UAAU,EACV,cAAc,CACf,CAAC;IAEF,MAAM,UAAU,GAAG,eAAe,CAAC,uBAAuB,CAAC,GAAG,CAC5D,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAC5C,CAAC;IAEF,MAAM,yBAAyB,GAC7B,eAAe,CAAC,yBAAyB,CAAC,GAAG,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAC5C,CAAC;IAEJ,MAAM,mBAAmB,GAAG,IAAI,qCAAmB,CACjD,QAAQ,EACR,UAAU,EACV,yBAAyB,CAC1B,CAAC;IAEF,OAAO,IAAI,qBAAS,CAAC,SAAS,EAAE,cAAc,EAAE,mBAAmB,CAAC,CAAC;AACvE,CAAC,CAAC;AAhCW,QAAA,qBAAqB,yBAgChC;AAUF,MAAM,mBAAmB,GAAG,CAAC,KAA+B,EAAgB,EAAE;IAC5E,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAC5C,CAAC;IAEF,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC,GAAG,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAC5C,CAAC;IAEF,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC,GAAG,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAC5C,CAAC;IAEF,MAAM,YAAY,GAAG,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAC7C,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAC5C,CAAC;IAEF,MAAM,UAAU,GAAG,KAAK,CAAC,cAAc,CAAC,GAAG,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAC5C,CAAC;IAEF,OAAO,IAAI,CAAC,CAAC,UAAU,CACrB,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,UAAU,CACX,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -2,8 +2,8 @@ import type { TypeDefinition, SavedTypeDefinition } from "./typedefinitions";
|
|
|
2
2
|
import type { TsExpression } from "./expression";
|
|
3
3
|
export declare class Namespace implements TsExpression {
|
|
4
4
|
private namespace;
|
|
5
|
-
private
|
|
6
|
-
private
|
|
7
|
-
constructor(namespace: string,
|
|
5
|
+
private typeDefinition;
|
|
6
|
+
private savedTypeDefinition;
|
|
7
|
+
constructor(namespace: string, typeDefinition: TypeDefinition, savedTypeDefinition: SavedTypeDefinition);
|
|
8
8
|
tsExpression(): string;
|
|
9
9
|
}
|
|
@@ -2,16 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Namespace = void 0;
|
|
4
4
|
class Namespace {
|
|
5
|
-
constructor(namespace,
|
|
5
|
+
constructor(namespace, typeDefinition, savedTypeDefinition) {
|
|
6
6
|
this.namespace = namespace;
|
|
7
|
-
this.
|
|
8
|
-
this.
|
|
7
|
+
this.typeDefinition = typeDefinition;
|
|
8
|
+
this.savedTypeDefinition = savedTypeDefinition;
|
|
9
9
|
}
|
|
10
10
|
tsExpression() {
|
|
11
11
|
return `
|
|
12
12
|
declare namespace ${this.namespace} {
|
|
13
|
-
${this.
|
|
14
|
-
${this.
|
|
13
|
+
${this.typeDefinition.tsExpression()}
|
|
14
|
+
${this.savedTypeDefinition.tsExpression()}
|
|
15
15
|
}`.trim();
|
|
16
16
|
}
|
|
17
17
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { FieldTypeGroups } from "../converters/fileldtype-converter";
|
|
2
|
-
interface RenderInput {
|
|
2
|
+
export interface RenderInput {
|
|
3
3
|
typeName: string;
|
|
4
4
|
namespace: string;
|
|
5
5
|
fieldTypeGroups: FieldTypeGroups;
|
|
@@ -7,4 +7,3 @@ interface RenderInput {
|
|
|
7
7
|
export declare const TypeDefinitionTemplate: {
|
|
8
8
|
renderAsFile: (output: string, renderInput: RenderInput) => Promise<void>;
|
|
9
9
|
};
|
|
10
|
-
export {};
|
|
@@ -58,7 +58,14 @@ const renderAsFile = (output, renderInput) => __awaiter(void 0, void 0, void 0,
|
|
|
58
58
|
});
|
|
59
59
|
const eslintResult = (yield eslint.lintText(tsExpression.tsExpression()))[0];
|
|
60
60
|
if (eslintResult.fatalErrorCount > 0) {
|
|
61
|
-
|
|
61
|
+
let errorMessage = "";
|
|
62
|
+
if (eslintResult.messages.length > 0) {
|
|
63
|
+
errorMessage = `Causes:`;
|
|
64
|
+
eslintResult.messages.forEach((error) => {
|
|
65
|
+
errorMessage += `\n- ${error.message}`;
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
throw new Error(`Failed to fix lint errors on the generated type definition file.\n${errorMessage}`);
|
|
62
69
|
}
|
|
63
70
|
let eslintOutput = "";
|
|
64
71
|
// https://eslint.org/docs/developer-guide/nodejs-api#-lintresult-type
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/templates/template.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,mDAAqC;AACrC,mCAAgC;AAGhC,2CAAoD;AAQpD,MAAM,YAAY,GAAG,CAAO,MAAc,EAAE,WAAwB,EAAE,EAAE;IACtE,MAAM,YAAY,GAAG,IAAA,iCAAqB,EAAC,WAAW,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC;QACxB,GAAG,EAAE,IAAI;QACT,WAAW,EAAE,KAAK;QAClB,UAAU,EAAE;YACV,OAAO,EAAE,0CAA0C;YACnD,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;aACd;YACD,KAAK,EAAE;gBACL,iCAAiC,EAAE;oBACjC,OAAO;oBACP,EAAE,iBAAiB,EAAE,IAAI,EAAE;iBAC5B;aACF;SACF;KACF,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,IAAI,YAAY,CAAC,eAAe,GAAG,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CACb,
|
|
1
|
+
{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/templates/template.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,mDAAqC;AACrC,mCAAgC;AAGhC,2CAAoD;AAQpD,MAAM,YAAY,GAAG,CAAO,MAAc,EAAE,WAAwB,EAAE,EAAE;IACtE,MAAM,YAAY,GAAG,IAAA,iCAAqB,EAAC,WAAW,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC;QACxB,GAAG,EAAE,IAAI;QACT,WAAW,EAAE,KAAK;QAClB,UAAU,EAAE;YACV,OAAO,EAAE,0CAA0C;YACnD,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;aACd;YACD,KAAK,EAAE;gBACL,iCAAiC,EAAE;oBACjC,OAAO;oBACP,EAAE,iBAAiB,EAAE,IAAI,EAAE;iBAC5B;aACF;SACF;KACF,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,IAAI,YAAY,CAAC,eAAe,GAAG,CAAC,EAAE;QACpC,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,YAAY,GAAG,SAAS,CAAC;YACzB,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtC,YAAY,IAAI,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;YACzC,CAAC,CAAC,CAAC;SACJ;QACD,MAAM,IAAI,KAAK,CACb,qEAAqE,YAAY,EAAE,CACpF,CAAC;KACH;IACD,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,sEAAsE;IACtE,IAAI,QAAQ,IAAI,YAAY,EAAE;QAC5B,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;KACpC;SAAM,IAAI,QAAQ,IAAI,YAAY,EAAE;QACnC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;KACpC;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACtC;IAED,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE;QACjD,MAAM,EAAE,YAAY;KACrB,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAExC,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;AACxD,CAAC,CAAA,CAAC;AACF,aAAa;AACA,QAAA,sBAAsB,GAAG;IACpC,YAAY;CACb,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const args_1 = require("../args");
|
|
4
|
+
const identifierConventionMsg = `The namespace and type-name convention:
|
|
5
|
+
- Starts with a letter (\`a-z\` or \`A-Z\`), underscore (\`_\`), or dollar sign (\`$\`).
|
|
6
|
+
- Can be followed by any alphanumeric, underscores, or dollar signs.`;
|
|
7
|
+
const invalidNamespaceMessage = `Invalid namespace option!\n${identifierConventionMsg}`;
|
|
8
|
+
const invalidTypeNameMessage = `Invalid type-name option!\n${identifierConventionMsg}`;
|
|
9
|
+
const baseInput = {
|
|
10
|
+
baseUrl: "",
|
|
11
|
+
preview: false,
|
|
12
|
+
demo: false,
|
|
13
|
+
output: "",
|
|
14
|
+
username: null,
|
|
15
|
+
password: null,
|
|
16
|
+
oAuthToken: null,
|
|
17
|
+
apiToken: null,
|
|
18
|
+
proxy: null,
|
|
19
|
+
basicAuthPassword: null,
|
|
20
|
+
basicAuthUsername: null,
|
|
21
|
+
appId: null,
|
|
22
|
+
guestSpaceId: null,
|
|
23
|
+
typeName: "",
|
|
24
|
+
namespace: "",
|
|
25
|
+
};
|
|
26
|
+
const patterns = [
|
|
27
|
+
{
|
|
28
|
+
description: "should error when do not specify base-url",
|
|
29
|
+
input: Object.assign(Object.assign({}, baseInput), { baseUrl: null }),
|
|
30
|
+
expected: {
|
|
31
|
+
failure: {
|
|
32
|
+
errorMessage: "--base-url (KINTONE_BASE_URL) must be specified",
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
description: "should not error when specifying valid namespace and type-name",
|
|
38
|
+
input: Object.assign(Object.assign({}, baseInput), { namespace: "com.cybozu.kintone", typeName: "AwesomeFields" }),
|
|
39
|
+
expected: {
|
|
40
|
+
failure: undefined,
|
|
41
|
+
},
|
|
42
|
+
},
|
|
43
|
+
{
|
|
44
|
+
description: "should error when namespace starts with a digit",
|
|
45
|
+
input: Object.assign(Object.assign({}, baseInput), { namespace: "1test" }),
|
|
46
|
+
expected: {
|
|
47
|
+
failure: {
|
|
48
|
+
errorMessage: invalidNamespaceMessage,
|
|
49
|
+
},
|
|
50
|
+
},
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
description: "should error when namespace contains invalid characters",
|
|
54
|
+
input: Object.assign(Object.assign({}, baseInput), { namespace: "te-st" }),
|
|
55
|
+
expected: {
|
|
56
|
+
failure: {
|
|
57
|
+
errorMessage: invalidNamespaceMessage,
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
description: "should error when type-name starts with a digit",
|
|
63
|
+
input: Object.assign(Object.assign({}, baseInput), { typeName: "1test" }),
|
|
64
|
+
expected: {
|
|
65
|
+
failure: {
|
|
66
|
+
errorMessage: invalidTypeNameMessage,
|
|
67
|
+
},
|
|
68
|
+
},
|
|
69
|
+
},
|
|
70
|
+
{
|
|
71
|
+
description: "should error when type-name contains invalid characters",
|
|
72
|
+
input: Object.assign(Object.assign({}, baseInput), { typeName: "te-st" }),
|
|
73
|
+
expected: {
|
|
74
|
+
failure: {
|
|
75
|
+
errorMessage: invalidTypeNameMessage,
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
},
|
|
79
|
+
];
|
|
80
|
+
describe("validateInput", () => {
|
|
81
|
+
test.each(patterns)("$description", (pattern) => {
|
|
82
|
+
if (pattern.expected.failure !== undefined) {
|
|
83
|
+
return expect(() => {
|
|
84
|
+
(0, args_1.validateArgs)(pattern.input);
|
|
85
|
+
}).toThrow(new Error(pattern.expected.failure.errorMessage));
|
|
86
|
+
}
|
|
87
|
+
return expect(() => {
|
|
88
|
+
(0, args_1.validateArgs)(pattern.input);
|
|
89
|
+
}).not.toThrow();
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
//# sourceMappingURL=args.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"args.test.js","sourceRoot":"","sources":["../../../src/validators/__tests__/args.test.ts"],"names":[],"mappings":";;AAAA,kCAAuC;AAEvC,MAAM,uBAAuB,GAAG;;qEAEqC,CAAC;AACtE,MAAM,uBAAuB,GAAG,8BAA8B,uBAAuB,EAAE,CAAC;AACxF,MAAM,sBAAsB,GAAG,8BAA8B,uBAAuB,EAAE,CAAC;AACvF,MAAM,SAAS,GAAG;IAChB,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,KAAK;IACX,MAAM,EAAE,EAAE;IACV,QAAQ,EAAE,IAAI;IACd,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,IAAI;IACd,KAAK,EAAE,IAAI;IACX,iBAAiB,EAAE,IAAI;IACvB,iBAAiB,EAAE,IAAI;IACvB,KAAK,EAAE,IAAI;IACX,YAAY,EAAE,IAAI;IAClB,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,EAAE;CACd,CAAC;AACF,MAAM,QAAQ,GAAG;IACf;QACE,WAAW,EAAE,2CAA2C;QACxD,KAAK,kCACA,SAAS,KACZ,OAAO,EAAE,IAAI,GACd;QACD,QAAQ,EAAE;YACR,OAAO,EAAE;gBACP,YAAY,EAAE,iDAAiD;aAChE;SACF;KACF;IACD;QACE,WAAW,EACT,gEAAgE;QAClE,KAAK,kCACA,SAAS,KACZ,SAAS,EAAE,oBAAoB,EAC/B,QAAQ,EAAE,eAAe,GAC1B;QACD,QAAQ,EAAE;YACR,OAAO,EAAE,SAAS;SACnB;KACF;IACD;QACE,WAAW,EAAE,iDAAiD;QAC9D,KAAK,kCAAO,SAAS,KAAE,SAAS,EAAE,OAAO,GAAE;QAC3C,QAAQ,EAAE;YACR,OAAO,EAAE;gBACP,YAAY,EAAE,uBAAuB;aACtC;SACF;KACF;IACD;QACE,WAAW,EAAE,yDAAyD;QACtE,KAAK,kCAAO,SAAS,KAAE,SAAS,EAAE,OAAO,GAAE;QAC3C,QAAQ,EAAE;YACR,OAAO,EAAE;gBACP,YAAY,EAAE,uBAAuB;aACtC;SACF;KACF;IACD;QACE,WAAW,EAAE,iDAAiD;QAC9D,KAAK,kCAAO,SAAS,KAAE,QAAQ,EAAE,OAAO,GAAE;QAC1C,QAAQ,EAAE;YACR,OAAO,EAAE;gBACP,YAAY,EAAE,sBAAsB;aACrC;SACF;KACF;IACD;QACE,WAAW,EAAE,yDAAyD;QACtE,KAAK,kCAAO,SAAS,KAAE,QAAQ,EAAE,OAAO,GAAE;QAC1C,QAAQ,EAAE;YACR,OAAO,EAAE;gBACP,YAAY,EAAE,sBAAsB;aACrC;SACF;KACF;CACF,CAAC;AAEF,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;QAC9C,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,KAAK,SAAS,EAAE;YAC1C,OAAO,MAAM,CAAC,GAAG,EAAE;gBACjB,IAAA,mBAAY,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;SAC9D;QAED,OAAO,MAAM,CAAC,GAAG,EAAE;YACjB,IAAA,mBAAY,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateArgs = void 0;
|
|
4
|
+
const validateArgs = (args) => {
|
|
5
|
+
if (args.baseUrl === null) {
|
|
6
|
+
throw new Error("--base-url (KINTONE_BASE_URL) must be specified");
|
|
7
|
+
}
|
|
8
|
+
const identifierConventionMsg = `The namespace and type-name convention:
|
|
9
|
+
- Starts with a letter (\`a-z\` or \`A-Z\`), underscore (\`_\`), or dollar sign (\`$\`).
|
|
10
|
+
- Can be followed by any alphanumeric, underscores, or dollar signs.`;
|
|
11
|
+
if (args.namespace && !isValidIdentifier(args.namespace)) {
|
|
12
|
+
throw new Error(`Invalid namespace option!\n${identifierConventionMsg}`);
|
|
13
|
+
}
|
|
14
|
+
if (args.typeName && !isValidIdentifier(args.typeName)) {
|
|
15
|
+
throw new Error(`Invalid type-name option!\n${identifierConventionMsg}`);
|
|
16
|
+
}
|
|
17
|
+
};
|
|
18
|
+
exports.validateArgs = validateArgs;
|
|
19
|
+
/**
|
|
20
|
+
* https://developer.mozilla.org/en-US/docs/Glossary/Identifier
|
|
21
|
+
* @param targetIdentifier
|
|
22
|
+
*/
|
|
23
|
+
const isValidIdentifier = (targetIdentifier) => {
|
|
24
|
+
const identifiers = targetIdentifier.split(".");
|
|
25
|
+
const identifierRegex = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
|
|
26
|
+
return identifiers.every((identifier) => identifierRegex.test(identifier));
|
|
27
|
+
};
|
|
28
|
+
//# sourceMappingURL=args.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/validators/args.ts"],"names":[],"mappings":";;;AAEO,MAAM,YAAY,GAAG,CAAC,IAAgB,EAAE,EAAE;IAC/C,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;KACpE;IAED,MAAM,uBAAuB,GAAG;;qEAEmC,CAAC;IAEpE,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QACxD,MAAM,IAAI,KAAK,CAAC,8BAA8B,uBAAuB,EAAE,CAAC,CAAC;KAC1E;IAED,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACtD,MAAM,IAAI,KAAK,CAAC,8BAA8B,uBAAuB,EAAE,CAAC,CAAC;KAC1E;AACH,CAAC,CAAC;AAhBW,QAAA,YAAY,gBAgBvB;AAEF;;;GAGG;AACH,MAAM,iBAAiB,GAAG,CAAC,gBAAwB,EAAW,EAAE;IAC9D,MAAM,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,4BAA4B,CAAC;IACrD,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;AAC7E,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kintone/dts-gen",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "7.0.1",
|
|
4
4
|
"description": "Types for kintone js api and Types generating tools",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"build:integration": "webpack --mode development --config webpack.config.js"
|
|
22
22
|
},
|
|
23
23
|
"engines": {
|
|
24
|
-
"node": ">=
|
|
24
|
+
"node": ">=16"
|
|
25
25
|
},
|
|
26
26
|
"author": {
|
|
27
27
|
"name": "Cybozu, Inc.",
|
|
@@ -38,12 +38,12 @@
|
|
|
38
38
|
"prettier": "^2.8.8"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@types/eslint": "^8.40.
|
|
41
|
+
"@types/eslint": "^8.40.1",
|
|
42
42
|
"@types/lodash": "^4.14.195",
|
|
43
|
-
"@types/prettier": "^2.7.
|
|
43
|
+
"@types/prettier": "^2.7.3",
|
|
44
44
|
"ts-loader": "^9.4.3",
|
|
45
|
-
"webpack": "^5.
|
|
46
|
-
"webpack-cli": "^5.1.
|
|
45
|
+
"webpack": "^5.86.0",
|
|
46
|
+
"webpack-cli": "^5.1.4"
|
|
47
47
|
},
|
|
48
48
|
"bin": {
|
|
49
49
|
"kintone-dts-gen": "dist/index.js"
|
|
@@ -64,5 +64,5 @@
|
|
|
64
64
|
"keywords": [
|
|
65
65
|
"kintone"
|
|
66
66
|
],
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "cc57f705afb4672f4589e633e83de868d27a768b"
|
|
68
68
|
}
|