ESM化 + tsup

.gitignore

@@ -67,3 +67,5 @@ test/helpers/request.json
 .idea/
 
 git_push.sh
+/module/
+/lib/

.mocharc.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://json.schemastore.org/mocharc",
+  "loader": "ts-node/esm",
+  "spec": [
+    "test/**/*.ts",
+    "lib/*/tests/**/*.ts"
+  ]
+}

examples/echo-bot-ts/index.ts

@@ -33,7 +33,7 @@ const isTextEvent = (event: any): event is webhook.MessageEvent & { message: web
 };
 
 // Function handler to receive the text.
-const textEventHandler = async (event: webhook.Event): Promise<MessageAPIResponseBase | undefined> => {
+const textEventHandler = async (event: typeof webhook.Event): Promise<MessageAPIResponseBase | undefined> => {
   // Process all variables here.
   if (!isTextEvent(event)) {
     return;

generate-code.py

@@ -76,7 +76,7 @@ def generate_webhook():
     run_command(f'rm -rf lib/webhook/tests/')
 
     with open('lib/webhook/api.ts', 'w') as wfp:
-        wfp.write("""export * from './model/models';""")
+        wfp.write("""export * from './model/models.js';""")
 
 
 def main():

generator/src/main/resources/line-bot-sdk-nodejs-generator/api-all.pebble

@@ -1,4 +1,4 @@
 {# @pebvariable name="apiInfo" type="org.openapitools.codegen.model.ApiInfoMap" #}
 {% for api in apiInfo.apis -%}
-export { {{ api.operations.classname }} } from './{{ api.get("classFilename") }}';
+export { {{ api.operations.classname }} } from './{{ api.get("classFilename") }}.js';
 {% endfor %}

generator/src/main/resources/line-bot-sdk-nodejs-generator/api-single.pebble

@@ -5,13 +5,13 @@
 
 /* tslint:disable:no-unused-locals */
 {% for import in imports -%}
-import { {{import.classname}} } from '{{import.filename}}';
+import { {{import.classname}} } from '{{import.filename}}.js';
 {% endfor %}
-import * as Types from "../../types";
-import {ensureJSON} from "../../utils";
+import * as Types from "../../types.js";
+import {ensureJSON} from "../../utils.js";
 import {Readable} from "node:stream";
 
-import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";
+import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch.js";
 
 // ===============================================
 // This file is autogenerated - Please do not edit

generator/src/main/resources/line-bot-sdk-nodejs-generator/api.pebble

@@ -1,3 +1,3 @@
 // This is the entrypoint for the package
-export * from './api/apis';
-export * from './model/models';
+export * from './api/apis.js';
+export * from './model/models.js';

generator/src/main/resources/line-bot-sdk-nodejs-generator/api_test.pebble

@@ -1,16 +1,18 @@
 {# @pebvariable name="imports" type="java.util.List<java.util.Map<String, String>>" #}
 {# @pebvariable name="operations" type="org.openapitools.codegen.model.OperationMap" #}
 {# @pebvariable name="authMethods" type="java.util.ArrayList<org.openapitools.codegen.CodegenSecurity>" -#}
-import { {{operations.classname}} } from "../../api";
+import { {{operations.classname}} } from "../../api.js";
 
 {% for import in imports -%}
-import { {{import.classname}} } from '../{{import.filename}}';
+import { {{import.classname}} } from '../{{import.filename}}.js';
 {% endfor %}
 
 import { createServer } from "node:http";
 import { deepEqual, equal, ok } from "node:assert";
 
-const pkg = require("../../../../package.json");
+import module from "node:module";
+const requireModule = module.createRequire(import.meta.url);
+const pkg = requireModule("../../../../package.json");
 
 const channel_access_token = "test_channel_access_token";
 

generator/src/main/resources/line-bot-sdk-nodejs-generator/model.pebble

@@ -3,12 +3,12 @@
 {% for model in models %}
 
     {% for tsi in model.get('tsImports') -%}
-import { {{ tsi.classname }} } from '{{ tsi.filename }}';
+import { {{ tsi.classname }} } from '{{ tsi.filename }}.js';
     {%- endfor %}
 
     {% if model.model.discriminator != null %}
         {% for model in model.model.discriminator.mappedModels -%}
-import { {{model.modelName}} } from './models';
+import { {{model.modelName}} } from './models.js';
         {% endfor %}
 
 export type {{classname}} =
@@ -30,7 +30,7 @@ export type Unknown{{classname}} = {{classname}}Base & {
     {%- endif -%}
     {% if not model.model.isEnum -%}
         {% if model.model.parent != null %}
-import { {{ model.model.parent }}Base } from './models';
+import { {{ model.model.parent }}Base } from './models.js';
 
         {% endif %}
 export type {{classname}}{% if model.model.discriminator != null %}Base{% endif %} = {% if model.model.parent != null %}{{ model.model.parent }}Base & {% endif %} { {% if model.model.vendorExtensions.get("x-selector") != null %}

generator/src/main/resources/line-bot-sdk-nodejs-generator/models.pebble

@@ -1,4 +1,4 @@
 {# @pebvariable name="models" type="java.util.ArrayList<org.openapitools.codegen.model.ModelMap>" #}
 {% for model in models -%}
-export * from '{{ model.model.classFilename }}';
+export * from '{{ model.model.classFilename }}.js';
 {%- endfor %}

lib/channel-access-token/api.ts

@@ -1,3 +1,3 @@
 // This is the entrypoint for the package
-export * from "./api/apis";
-export * from "./model/models";
+export * from './api/apis.js';
+export * from './model/models.js';

lib/channel-access-token/api/apis.ts

@@ -1 +1,3 @@
-export { ChannelAccessTokenClient } from "./channelAccessTokenClient";
+
+export { ChannelAccessTokenClient } from './channelAccessTokenClient.js';
+