@kintone/dts-gen 8.0.13 → 8.1.0

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.
@@ -575,7 +575,7 @@ eval("\nvar __createBinding = (this && this.__createBinding) || (Object.create ?
575
575
  /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
576
576
 
577
577
  "use strict";
578
- eval("\nvar __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {\n if (k2 === undefined) k2 = k;\n var desc = Object.getOwnPropertyDescriptor(m, k);\n if (!desc || (\"get\" in desc ? !m.__esModule : desc.writable || desc.configurable)) {\n desc = { enumerable: true, get: function() { return m[k]; } };\n }\n Object.defineProperty(o, k2, desc);\n}) : (function(o, m, k, k2) {\n if (k2 === undefined) k2 = k;\n o[k2] = m[k];\n}));\nvar __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {\n Object.defineProperty(o, \"default\", { enumerable: true, value: v });\n}) : function(o, v) {\n o[\"default\"] = v;\n});\nvar __importStar = (this && this.__importStar) || function (mod) {\n if (mod && mod.__esModule) return mod;\n var result = {};\n if (mod != null) for (var k in mod) if (k !== \"default\" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);\n __setModuleDefault(result, mod);\n return result;\n};\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\n// eslint-disable-next-line @typescript-eslint/triple-slash-reference, spaced-comment\n/// <reference types=\"../../kintone\" />\n// eslint-disable-next-line @typescript-eslint/triple-slash-reference, spaced-comment\n/// <reference path=\"./testfields.d.ts\" />\nconst assert = __importStar(__webpack_require__(/*! assert */ \"../../node_modules/.pnpm/assert@2.1.0/node_modules/assert/build/assert.js\"));\nconst dts_gen_api_test_1 = __webpack_require__(/*! ./dts-gen-api-test */ \"./src/integration-tests/dts-gen-api-test.ts\");\nconst dts_gen_fields_test_1 = __webpack_require__(/*! ./dts-gen-fields-test */ \"./src/integration-tests/dts-gen-fields-test.ts\");\n(() => {\n kintone.events.on(\"app.record.index.show\", (ev) => {\n dts_gen_api_test_1.DTSGenApiTest.assertKintoneBuiltinFunctions();\n dts_gen_fields_test_1.DTSGenFieldsTest.assertFieldTypes(ev.records[0]);\n assertNotUndefined(ev.appId);\n assertNotUndefined(ev.viewType);\n assertNotUndefined(ev.viewId);\n assertNotUndefined(ev.viewName);\n assertNotUndefined(ev.offset);\n assertNotUndefined(ev.size);\n assertNotUndefined(ev.date);\n });\n const assertNotUndefined = (ref) => {\n assert.ok(ref !== undefined);\n };\n})();\n\n\n//# sourceURL=webpack://@kintone/dts-gen/./src/integration-tests/dts-gen-integration-test.ts?");
578
+ eval("\nvar __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {\n if (k2 === undefined) k2 = k;\n var desc = Object.getOwnPropertyDescriptor(m, k);\n if (!desc || (\"get\" in desc ? !m.__esModule : desc.writable || desc.configurable)) {\n desc = { enumerable: true, get: function() { return m[k]; } };\n }\n Object.defineProperty(o, k2, desc);\n}) : (function(o, m, k, k2) {\n if (k2 === undefined) k2 = k;\n o[k2] = m[k];\n}));\nvar __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {\n Object.defineProperty(o, \"default\", { enumerable: true, value: v });\n}) : function(o, v) {\n o[\"default\"] = v;\n});\nvar __importStar = (this && this.__importStar) || function (mod) {\n if (mod && mod.__esModule) return mod;\n var result = {};\n if (mod != null) for (var k in mod) if (k !== \"default\" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);\n __setModuleDefault(result, mod);\n return result;\n};\nObject.defineProperty(exports, \"__esModule\", ({ value: true }));\n// eslint-disable-next-line spaced-comment\n/// <reference types=\"../../kintone\" />\n// eslint-disable-next-line @typescript-eslint/triple-slash-reference, spaced-comment\n/// <reference path=\"./testfields.d.ts\" />\nconst assert = __importStar(__webpack_require__(/*! assert */ \"../../node_modules/.pnpm/assert@2.1.0/node_modules/assert/build/assert.js\"));\nconst dts_gen_api_test_1 = __webpack_require__(/*! ./dts-gen-api-test */ \"./src/integration-tests/dts-gen-api-test.ts\");\nconst dts_gen_fields_test_1 = __webpack_require__(/*! ./dts-gen-fields-test */ \"./src/integration-tests/dts-gen-fields-test.ts\");\n(() => {\n kintone.events.on(\"app.record.index.show\", (ev) => {\n dts_gen_api_test_1.DTSGenApiTest.assertKintoneBuiltinFunctions();\n dts_gen_fields_test_1.DTSGenFieldsTest.assertFieldTypes(ev.records[0]);\n assertNotUndefined(ev.appId);\n assertNotUndefined(ev.viewType);\n assertNotUndefined(ev.viewId);\n assertNotUndefined(ev.viewName);\n assertNotUndefined(ev.offset);\n assertNotUndefined(ev.size);\n assertNotUndefined(ev.date);\n });\n const assertNotUndefined = (ref) => {\n assert.ok(ref !== undefined);\n };\n})();\n\n\n//# sourceURL=webpack://@kintone/dts-gen/./src/integration-tests/dts-gen-integration-test.ts?");
579
579
 
580
580
  /***/ }),
581
581
 
package/dist/index.js CHANGED
@@ -17,7 +17,7 @@ const objectvalues_1 = require("./utils/objectvalues");
17
17
  const cli_parser_1 = require("./cli-parser");
18
18
  process.on("uncaughtException", (e) => {
19
19
  console.error(e.message);
20
- // eslint-disable-next-line no-process-exit
20
+ // eslint-disable-next-line n/no-process-exit
21
21
  process.exit(1);
22
22
  });
23
23
  const args = (0, cli_parser_1.parse)(process.argv);
@@ -39,7 +39,7 @@ const handler = () => __awaiter(void 0, void 0, void 0, function* () {
39
39
  });
40
40
  handler().catch((err) => {
41
41
  console.error(err);
42
- // eslint-disable-next-line no-process-exit
42
+ // eslint-disable-next-line n/no-process-exit
43
43
  process.exit(1);
44
44
  });
45
45
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,2EAAsE;AACtE,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,mCAAe,CAAC,IAAI,CAAC,CAAC;AAEzC,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
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,2EAAsE;AACtE,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,6CAA6C;IAC7C,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,mCAAe,CAAC,IAAI,CAAC,CAAC;AAEzC,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,6CAA6C;IAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- // eslint-disable-next-line @typescript-eslint/triple-slash-reference, spaced-comment
26
+ // eslint-disable-next-line spaced-comment
27
27
  /// <reference types="../../kintone" />
28
28
  // eslint-disable-next-line @typescript-eslint/triple-slash-reference, spaced-comment
29
29
  /// <reference path="./testfields.d.ts" />
@@ -1 +1 @@
1
- {"version":3,"file":"dts-gen-integration-test.js","sourceRoot":"","sources":["../../src/integration-tests/dts-gen-integration-test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qFAAqF;AACrF,uCAAuC;AACvC,qFAAqF;AACrF,0CAA0C;AAC1C,+CAAiC;AAEjC,yDAAmD;AACnD,+DAAyD;AAYzD,CAAC,GAAG,EAAE;IACJ,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,CAAC,EAAS,EAAE,EAAE;QACvD,gCAAa,CAAC,6BAA6B,EAAE,CAAC;QAC9C,sCAAgB,CAAC,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjD,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QAC7B,kBAAkB,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAChC,kBAAkB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QAC9B,kBAAkB,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAChC,kBAAkB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QAC9B,kBAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAC5B,kBAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,EAAE;QACjC,MAAM,CAAC,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC,CAAC,EAAE,CAAC"}
1
+ {"version":3,"file":"dts-gen-integration-test.js","sourceRoot":"","sources":["../../src/integration-tests/dts-gen-integration-test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA0C;AAC1C,uCAAuC;AACvC,qFAAqF;AACrF,0CAA0C;AAC1C,+CAAiC;AAEjC,yDAAmD;AACnD,+DAAyD;AAYzD,CAAC,GAAG,EAAE;IACJ,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,CAAC,EAAS,EAAE,EAAE;QACvD,gCAAa,CAAC,6BAA6B,EAAE,CAAC;QAC9C,sCAAgB,CAAC,gBAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjD,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QAC7B,kBAAkB,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAChC,kBAAkB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QAC9B,kBAAkB,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAChC,kBAAkB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QAC9B,kBAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAC5B,kBAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,EAAE;QACjC,MAAM,CAAC,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC,CAAC,EAAE,CAAC"}
@@ -31,6 +31,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
31
31
  step((generator = generator.apply(thisArg, _arguments || [])).next());
32
32
  });
33
33
  };
34
+ var __importDefault = (this && this.__importDefault) || function (mod) {
35
+ return (mod && mod.__esModule) ? mod : { "default": mod };
36
+ };
34
37
  Object.defineProperty(exports, "__esModule", { value: true });
35
38
  exports.TypeDefinitionTemplate = void 0;
36
39
  const fs = __importStar(require("fs"));
@@ -40,17 +43,14 @@ const standalone_1 = require("prettier/standalone");
40
43
  const prettierPluginTypescript = __importStar(require("prettier/plugins/typescript"));
41
44
  const prettierPluginEstree = __importStar(require("prettier/plugins/estree"));
42
45
  const converter_1 = require("./converter");
46
+ const typescript_1 = __importDefault(require("@cybozu/eslint-config/flat/presets/typescript"));
43
47
  const renderAsFile = (output, renderInput) => __awaiter(void 0, void 0, void 0, function* () {
44
48
  const tsExpression = (0, converter_1.convertToTsExpression)(renderInput);
45
49
  const eslint = new eslint_1.ESLint({
46
50
  cwd: path.resolve(__dirname, "..", ".."),
47
51
  fix: true,
48
- useEslintrc: false,
49
- baseConfig: {
50
- extends: "@cybozu/eslint-config/presets/typescript",
51
- globals: {
52
- kintone: true,
53
- },
52
+ baseConfig: typescript_1.default,
53
+ overrideConfig: {
54
54
  rules: {
55
55
  "@typescript-eslint/no-namespace": [
56
56
  "error",
@@ -1 +1 @@
1
- {"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/templates/template.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,mCAAgC;AAChC,oDAA6C;AAC7C,sFAAwE;AACxE,8EAAgE;AAGhE,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,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;QACxC,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,CAAC;QACrC,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrC,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;QACL,CAAC;QACD,MAAM,IAAI,KAAK,CACb,qEAAqE,YAAY,EAAE,CACpF,CAAC;IACJ,CAAC;IACD,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,sEAAsE;IACtE,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;QAC7B,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;IACrC,CAAC;SAAM,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;QACpC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAM,EAAC,YAAY,EAAE;QAC9C,MAAM,EAAE,YAAY;QACpB,OAAO,EAAE,CAAC,wBAAwB,EAAE,oBAAoB,CAAC;KAC1D,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"}
1
+ {"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/templates/template.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,mCAAgC;AAChC,oDAA6C;AAC7C,sFAAwE;AACxE,8EAAgE;AAGhE,2CAAoD;AACpD,+FAAqE;AAQrE,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,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;QACxC,GAAG,EAAE,IAAI;QACT,UAAU,EAAE,oBAAQ;QACpB,cAAc,EAAE;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,CAAC;QACrC,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrC,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;QACL,CAAC;QACD,MAAM,IAAI,KAAK,CACb,qEAAqE,YAAY,EAAE,CACpF,CAAC;IACJ,CAAC;IACD,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,sEAAsE;IACtE,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;QAC7B,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;IACrC,CAAC;SAAM,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;QACpC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAM,EAAC,YAAY,EAAE;QAC9C,MAAM,EAAE,YAAY;QACpB,OAAO,EAAE,CAAC,wBAAwB,EAAE,oBAAoB,CAAC;KAC1D,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"}
@@ -31,15 +31,50 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
31
31
  step((generator = generator.apply(thisArg, _arguments || [])).next());
32
32
  });
33
33
  };
34
+ var __importDefault = (this && this.__importDefault) || function (mod) {
35
+ return (mod && mod.__esModule) ? mod : { "default": mod };
36
+ };
34
37
  Object.defineProperty(exports, "__esModule", { value: true });
35
- const template_1 = require("./template");
36
38
  const demo_client_1 = require("../kintone/clients/demo-client");
37
39
  const demo_fullwidth_symbol_client_1 = require("../kintone/clients/demo-fullwidth-symbol-client");
38
40
  const fileldtype_converter_1 = require("../converters/fileldtype-converter");
39
41
  const objectvalues_1 = require("../utils/objectvalues");
40
42
  const fs = __importStar(require("fs"));
41
- describe("renderAsFile", () => {
42
- const TEMP_TEST_TYPEDEF = "tmp.test-renderAsFile-fields.d.ts";
43
+ const eslint_1 = require("eslint");
44
+ const path_1 = __importDefault(require("path"));
45
+ const typescript_1 = __importDefault(require("@cybozu/eslint-config/flat/presets/typescript"));
46
+ const prettierPluginTypescript = __importStar(require("prettier/plugins/typescript"));
47
+ const prettierPluginEstree = __importStar(require("prettier/plugins/estree"));
48
+ const standalone_1 = require("prettier/standalone");
49
+ const converter_1 = require("./converter");
50
+ const writeAndLint = (filepath, expression) => __awaiter(void 0, void 0, void 0, function* () {
51
+ yield fs.promises.mkdir(path_1.default.dirname(filepath), { recursive: true });
52
+ // It fails when linting a string, so it is saved to a file first.
53
+ yield fs.promises.writeFile(filepath, expression);
54
+ const eslint = new eslint_1.ESLint({
55
+ cwd: path_1.default.resolve(__dirname, "..", ".."),
56
+ fix: true,
57
+ baseConfig: typescript_1.default,
58
+ overrideConfig: {
59
+ rules: {
60
+ "@typescript-eslint/no-namespace": [
61
+ "error",
62
+ { allowDeclarations: true },
63
+ ],
64
+ },
65
+ },
66
+ });
67
+ const eslintResult = (yield eslint.lintFiles(filepath))[0];
68
+ const eslintOutput = eslintResult.output;
69
+ const prettySource = yield (0, standalone_1.format)(eslintOutput, {
70
+ parser: "typescript",
71
+ plugins: [prettierPluginTypescript, prettierPluginEstree],
72
+ });
73
+ yield fs.promises.mkdir(path_1.default.dirname(filepath), { recursive: true });
74
+ yield fs.promises.writeFile(filepath, prettySource);
75
+ });
76
+ describe("convertToTsExpression", () => {
77
+ const TEMP_TEST_TYPEDEF = "tmp.test-convertToTsExpression-fields.d.ts";
43
78
  test("generate type definition file", () => __awaiter(void 0, void 0, void 0, function* () {
44
79
  const client = new demo_client_1.DemoClient();
45
80
  const fieldTypeGroups = yield client
@@ -54,9 +89,10 @@ describe("renderAsFile", () => {
54
89
  namespace: "kintone.types",
55
90
  fieldTypeGroups,
56
91
  };
57
- yield template_1.TypeDefinitionTemplate.renderAsFile(TEMP_TEST_TYPEDEF, input);
92
+ const tsExpression = (0, converter_1.convertToTsExpression)(input).tsExpression();
93
+ yield writeAndLint(TEMP_TEST_TYPEDEF, tsExpression);
58
94
  const expected = fs
59
- .readFileSync(`./resources/test-renderAsFile-fields.d.ts`)
95
+ .readFileSync(`./resources/test-convertToTsExpression-fields.d.ts`)
60
96
  .toString()
61
97
  .trim()
62
98
  .replace(/\r?\n/g, "");
@@ -91,7 +127,8 @@ describe("fullWidthSymbol Test", () => {
91
127
  namespace: "kintone.types",
92
128
  fieldTypeGroups,
93
129
  };
94
- yield template_1.TypeDefinitionTemplate.renderAsFile(TEMP_TEST_TYPEDEF, input);
130
+ const tsExpression = (0, converter_1.convertToTsExpression)(input).tsExpression();
131
+ yield writeAndLint(TEMP_TEST_TYPEDEF, tsExpression);
95
132
  const expected = fs
96
133
  .readFileSync("./resources/test-fullWidthSymbol-fields.d.ts")
97
134
  .toString()
@@ -1 +1 @@
1
- {"version":3,"file":"template.test.js","sourceRoot":"","sources":["../../src/templates/template.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"template.test.js","sourceRoot":"","sources":["../../src/templates/template.test.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.log = void 0;
4
4
  const log = (message) => {
5
- // eslint-disable-next-line no-console
6
5
  console.log(message);
7
6
  };
8
7
  exports.log = log;
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":";;;AAAO,MAAM,GAAG,GAAG,CAAC,OAAe,EAAE,EAAE;IACrC,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC,CAAC;AAHW,QAAA,GAAG,OAGd"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":";;;AAAO,MAAM,GAAG,GAAG,CAAC,OAAe,EAAE,EAAE;IACrC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC,CAAC;AAFW,QAAA,GAAG,OAEd"}
@@ -1,9 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
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.`;
4
+ const identifierConventionMsg = `In the ECMA262 specification, this is an invalid string as IdentifierName.`;
7
5
  const invalidNamespaceMessage = `Invalid namespace option!\n${identifierConventionMsg}`;
8
6
  const invalidTypeNameMessage = `Invalid type-name option!\n${identifierConventionMsg}`;
9
7
  const baseInput = {
@@ -75,6 +73,29 @@ const patterns = [
75
73
  },
76
74
  },
77
75
  },
76
+ {
77
+ description: "should not error when type-name contains japanese characters",
78
+ input: Object.assign(Object.assign({}, baseInput), { typeName: "案件管理" }),
79
+ expected: {
80
+ failure: undefined,
81
+ },
82
+ },
83
+ {
84
+ description: "should not error when type-name is only symbols",
85
+ input: Object.assign(Object.assign({}, baseInput), { typeName: "$$$" }),
86
+ expected: {
87
+ failure: undefined,
88
+ },
89
+ },
90
+ {
91
+ description: "should error when type-name starts with a space",
92
+ input: Object.assign(Object.assign({}, baseInput), { typeName: " test" }),
93
+ expected: {
94
+ failure: {
95
+ errorMessage: invalidTypeNameMessage,
96
+ },
97
+ },
98
+ },
78
99
  ];
79
100
  describe("validateInput", () => {
80
101
  test.each(patterns)("$description", (pattern) => {
@@ -1 +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,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,CAAC;YAC3C,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;QAC/D,CAAC;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"}
1
+ {"version":3,"file":"args.test.js","sourceRoot":"","sources":["../../../src/validators/__tests__/args.test.ts"],"names":[],"mappings":"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"}
@@ -5,9 +5,7 @@ const validateArgs = (args) => {
5
5
  if (args.baseUrl === null) {
6
6
  throw new Error("--base-url (KINTONE_BASE_URL) must be specified");
7
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.`;
8
+ const identifierConventionMsg = `In the ECMA262 specification, this is an invalid string as IdentifierName.`;
11
9
  if (args.namespace && !isValidIdentifier(args.namespace)) {
12
10
  throw new Error(`Invalid namespace option!\n${identifierConventionMsg}`);
13
11
  }
@@ -17,12 +15,12 @@ const validateArgs = (args) => {
17
15
  };
18
16
  exports.validateArgs = validateArgs;
19
17
  /**
20
- * https://developer.mozilla.org/en-US/docs/Glossary/Identifier
18
+ * https://262.ecma-international.org/14.0/index.html#prod-IdentifierName
21
19
  * @param targetIdentifier
22
20
  */
23
21
  const isValidIdentifier = (targetIdentifier) => {
24
22
  const identifiers = targetIdentifier.split(".");
25
- const identifierRegex = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
23
+ const identifierRegex = /^[\p{ID_Start}_$][\p{ID_Continue}$\u200C\u200D]*$/u;
26
24
  return identifiers.every((identifier) => identifierRegex.test(identifier));
27
25
  };
28
26
  //# sourceMappingURL=args.js.map
@@ -1 +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,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,uBAAuB,GAAG;;qEAEmC,CAAC;IAEpE,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,8BAA8B,uBAAuB,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,8BAA8B,uBAAuB,EAAE,CAAC,CAAC;IAC3E,CAAC;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"}
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,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,uBAAuB,GAAG,4EAA4E,CAAC;IAE7G,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,8BAA8B,uBAAuB,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,8BAA8B,uBAAuB,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,YAAY,gBAcvB;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,oDAAoD,CAAC;IAC7E,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": "8.0.13",
3
+ "version": "8.1.0",
4
4
  "description": "Types for kintone js api and Types generating tools",
5
5
  "main": "dist/index.js",
6
6
  "engines": {
@@ -12,21 +12,22 @@
12
12
  },
13
13
  "license": "MIT",
14
14
  "dependencies": {
15
- "@cybozu/eslint-config": "^23.0.0",
15
+ "@cybozu/eslint-config": "^24.0.0-beta.0",
16
16
  "axios": "^1.7.7",
17
17
  "commander": "^12.1.0",
18
- "eslint": "^8.57.0",
19
- "form-data": "^4.0.0",
18
+ "eslint": "^9.13.0",
19
+ "form-data": "^4.0.1",
20
20
  "lodash": "^4.17.21",
21
21
  "prettier": "^3.3.3"
22
22
  },
23
23
  "devDependencies": {
24
- "@types/eslint": "^8.56.12",
25
- "@types/lodash": "^4.17.7",
24
+ "@types/eslint": "^9.6.1",
25
+ "@types/lodash": "^4.17.13",
26
+ "assert": "^2.1.0",
27
+ "cross-env": "^7.0.3",
26
28
  "ts-loader": "^9.5.1",
27
- "webpack": "^5.94.0",
28
- "webpack-cli": "^5.1.4",
29
- "assert": "^2.1.0"
29
+ "webpack": "^5.96.1",
30
+ "webpack-cli": "^5.1.4"
30
31
  },
31
32
  "bin": {
32
33
  "kintone-dts-gen": "dist/index.js"
@@ -59,8 +60,8 @@
59
60
  "lint:prettier": "prettier --parser typescript --check \"src/**/*.{ts,tsx}\" ./kintone.d.ts",
60
61
  "lint": "run-p lint:*",
61
62
  "help": "node dist/index.js --help",
62
- "test": "jest",
63
- "test:ci": "jest --runInBand",
63
+ "test": "cross-env NODE_OPTIONS=--experimental-vm-modules npx jest",
64
+ "test:ci": "cross-env NODE_OPTIONS=--experimental-vm-modules npx jest --runInBand",
64
65
  "build:integration": "webpack --mode development --config webpack.config.js"
65
66
  }
66
67
  }