From c97f332ae7c61c3b75c1c9d8e39c8dd192730b08 Mon Sep 17 00:00:00 2001 From: "evgeniy.generalov" Date: Mon, 25 Aug 2025 19:18:38 +0300 Subject: [PATCH 1/8] Libsample relative paths --- ui2abc/sample/libsample/build/generated/c.ts | 5 +++ ui2abc/sample/libsample/package.json | 30 ++++++++++++++ ui2abc/sample/libsample/src/a.ts | 9 +++++ ui2abc/sample/libsample/src/b.ts | 4 ++ ui2abc/sample/libsample/tsconfig.json | 42 ++++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 ui2abc/sample/libsample/build/generated/c.ts create mode 100644 ui2abc/sample/libsample/package.json create mode 100644 ui2abc/sample/libsample/src/a.ts create mode 100644 ui2abc/sample/libsample/src/b.ts create mode 100644 ui2abc/sample/libsample/tsconfig.json diff --git a/ui2abc/sample/libsample/build/generated/c.ts b/ui2abc/sample/libsample/build/generated/c.ts new file mode 100644 index 000000000..5e11d9747 --- /dev/null +++ b/ui2abc/sample/libsample/build/generated/c.ts @@ -0,0 +1,5 @@ +import { b_data } from '../../src/b' + +export function c_calc(a: number): number { + return a * a + b_data(a * 3) +} diff --git a/ui2abc/sample/libsample/package.json b/ui2abc/sample/libsample/package.json new file mode 100644 index 000000000..979e14c59 --- /dev/null +++ b/ui2abc/sample/libsample/package.json @@ -0,0 +1,30 @@ +{ + "name": "libsample", + "version": "1.0.0", + "description": "", + + "type": "commonjs", + "main": "index.js", + + "unused_export": { + ".": { + "types" : "./lib/*.d.ts", + "default": "./lib/index.js" + }, + "./generated/*" : { + "types" : "./lib/build/generated/*.d.ts", + "default": "./lib/build/generated/index.js" + } + }, + + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [], + "author": "", + "license": "ISC", + + "devDependencies": { + "typescript": "^4.9.5" + } +} diff --git a/ui2abc/sample/libsample/src/a.ts b/ui2abc/sample/libsample/src/a.ts new file mode 100644 index 000000000..47975a7af --- /dev/null +++ b/ui2abc/sample/libsample/src/a.ts @@ -0,0 +1,9 @@ +import { c_calc } from '../build/generated/c' + +export function a_foo(i: number): void { + console.log(`a_foo: i=${i}`); + console.log(`a_foo: result=${c_calc(i)}`); +} + +// a.ts -> c.ts -> b.ts +a_foo(42) diff --git a/ui2abc/sample/libsample/src/b.ts b/ui2abc/sample/libsample/src/b.ts new file mode 100644 index 000000000..5214d3c00 --- /dev/null +++ b/ui2abc/sample/libsample/src/b.ts @@ -0,0 +1,4 @@ +export function b_data(init: number): number { + console.log(`b_data: init=${init}`); + return init * init +} diff --git a/ui2abc/sample/libsample/tsconfig.json b/ui2abc/sample/libsample/tsconfig.json new file mode 100644 index 000000000..8d4e45e47 --- /dev/null +++ b/ui2abc/sample/libsample/tsconfig.json @@ -0,0 +1,42 @@ +{ + "compilerOptions": { + "target": "es2016", + "incremental": true, + "composite": true, + + "module": "commonjs", + "moduleResolution": "node", + "rootDir": ".", + "baseUrl": ".", + + "declaration": true, + "declarationMap": true, + "outDir": "./lib", + "esModuleInterop": true, + + "strict": true, + "skipLibCheck": true + }, + "files": [ + "./src/a.ts", + "./src/b.ts", + "./build/generated/c.ts" + ] +} + // "isolatedModules": true, + // "allowSyntheticDefaultImports": true, + // "preserveSymlinks": true, + // "skipDefaultLibCheck": true, + // "emitDeclarationOnly": true, + // "sourceMap": true, + // "outFile": "./", + // "declarationDir": "./", + // "lib": [], + // "noLib": true, + // "moduleDetection": "auto", + + // "paths": {}, + // "rootDirs": [], + // "typeRoots": [], + // "types": [], + // "resolveJsonModule": true, -- Gitee From fcbde9e81f691bdb98a10b04904604d12f8da0c7 Mon Sep 17 00:00:00 2001 From: "evgeniy.generalov" Date: Mon, 25 Aug 2025 19:19:59 +0300 Subject: [PATCH 2/8] Output --- ui2abc/sample/libsample/lib/build/generated/c.d.ts | 2 ++ .../sample/libsample/lib/build/generated/c.d.ts.map | 1 + ui2abc/sample/libsample/lib/build/generated/c.js | 8 ++++++++ ui2abc/sample/libsample/lib/src/a.d.ts | 2 ++ ui2abc/sample/libsample/lib/src/a.d.ts.map | 1 + ui2abc/sample/libsample/lib/src/a.js | 11 +++++++++++ ui2abc/sample/libsample/lib/src/b.d.ts | 2 ++ ui2abc/sample/libsample/lib/src/b.d.ts.map | 1 + ui2abc/sample/libsample/lib/src/b.js | 8 ++++++++ 9 files changed, 36 insertions(+) create mode 100644 ui2abc/sample/libsample/lib/build/generated/c.d.ts create mode 100644 ui2abc/sample/libsample/lib/build/generated/c.d.ts.map create mode 100644 ui2abc/sample/libsample/lib/build/generated/c.js create mode 100644 ui2abc/sample/libsample/lib/src/a.d.ts create mode 100644 ui2abc/sample/libsample/lib/src/a.d.ts.map create mode 100644 ui2abc/sample/libsample/lib/src/a.js create mode 100644 ui2abc/sample/libsample/lib/src/b.d.ts create mode 100644 ui2abc/sample/libsample/lib/src/b.d.ts.map create mode 100644 ui2abc/sample/libsample/lib/src/b.js diff --git a/ui2abc/sample/libsample/lib/build/generated/c.d.ts b/ui2abc/sample/libsample/lib/build/generated/c.d.ts new file mode 100644 index 000000000..e1d93ed5d --- /dev/null +++ b/ui2abc/sample/libsample/lib/build/generated/c.d.ts @@ -0,0 +1,2 @@ +export declare function c_calc(a: number): number; +//# sourceMappingURL=c.d.ts.map \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/build/generated/c.d.ts.map b/ui2abc/sample/libsample/lib/build/generated/c.d.ts.map new file mode 100644 index 000000000..7309bd0b8 --- /dev/null +++ b/ui2abc/sample/libsample/lib/build/generated/c.d.ts.map @@ -0,0 +1 @@ +{"version":3,"file":"c.d.ts","sourceRoot":"","sources":["../../../build/generated/c.ts"],"names":[],"mappings":"AAEA,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExC"} \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/build/generated/c.js b/ui2abc/sample/libsample/lib/build/generated/c.js new file mode 100644 index 000000000..72f4ba3fe --- /dev/null +++ b/ui2abc/sample/libsample/lib/build/generated/c.js @@ -0,0 +1,8 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.c_calc = void 0; +const b_1 = require("../../src/b"); +function c_calc(a) { + return a * a + (0, b_1.b_data)(a * 3); +} +exports.c_calc = c_calc; diff --git a/ui2abc/sample/libsample/lib/src/a.d.ts b/ui2abc/sample/libsample/lib/src/a.d.ts new file mode 100644 index 000000000..ac4cb97c5 --- /dev/null +++ b/ui2abc/sample/libsample/lib/src/a.d.ts @@ -0,0 +1,2 @@ +export declare function a_foo(i: number): void; +//# sourceMappingURL=a.d.ts.map \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/src/a.d.ts.map b/ui2abc/sample/libsample/lib/src/a.d.ts.map new file mode 100644 index 000000000..630eb669f --- /dev/null +++ b/ui2abc/sample/libsample/lib/src/a.d.ts.map @@ -0,0 +1 @@ +{"version":3,"file":"a.d.ts","sourceRoot":"","sources":["../../src/a.ts"],"names":[],"mappings":"AAEA,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAGrC"} \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/src/a.js b/ui2abc/sample/libsample/lib/src/a.js new file mode 100644 index 000000000..e2764b7fe --- /dev/null +++ b/ui2abc/sample/libsample/lib/src/a.js @@ -0,0 +1,11 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.a_foo = void 0; +const c_1 = require("../build/generated/c"); +function a_foo(i) { + console.log(`a_foo: i=${i}`); + console.log(`a_foo: result=${(0, c_1.c_calc)(i)}`); +} +exports.a_foo = a_foo; +// a.ts -> c.ts -> b.ts +a_foo(42); diff --git a/ui2abc/sample/libsample/lib/src/b.d.ts b/ui2abc/sample/libsample/lib/src/b.d.ts new file mode 100644 index 000000000..79997aa30 --- /dev/null +++ b/ui2abc/sample/libsample/lib/src/b.d.ts @@ -0,0 +1,2 @@ +export declare function b_data(init: number): number; +//# sourceMappingURL=b.d.ts.map \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/src/b.d.ts.map b/ui2abc/sample/libsample/lib/src/b.d.ts.map new file mode 100644 index 000000000..f6ddac77e --- /dev/null +++ b/ui2abc/sample/libsample/lib/src/b.d.ts.map @@ -0,0 +1 @@ +{"version":3,"file":"b.d.ts","sourceRoot":"","sources":["../../src/b.ts"],"names":[],"mappings":"AAAA,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG3C"} \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/src/b.js b/ui2abc/sample/libsample/lib/src/b.js new file mode 100644 index 000000000..c0cbe38fe --- /dev/null +++ b/ui2abc/sample/libsample/lib/src/b.js @@ -0,0 +1,8 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.b_data = void 0; +function b_data(init) { + console.log(`b_data: init=${init}`); + return init * init; +} +exports.b_data = b_data; -- Gitee From e892298db1e5b0f760e492cb9ac5863d2597905a Mon Sep 17 00:00:00 2001 From: "evgeniy.generalov" Date: Tue, 26 Aug 2025 10:09:35 +0300 Subject: [PATCH 3/8] rootDirs --- ui2abc/sample/libsample/build/generated/{ => src}/c.ts | 2 +- ui2abc/sample/libsample/build/generated/src/peers/d.ts | 2 ++ ui2abc/sample/libsample/src/a.ts | 3 ++- ui2abc/sample/libsample/src/generated/b.ts | 4 ++++ 4 files changed, 9 insertions(+), 2 deletions(-) rename ui2abc/sample/libsample/build/generated/{ => src}/c.ts (68%) create mode 100644 ui2abc/sample/libsample/build/generated/src/peers/d.ts create mode 100644 ui2abc/sample/libsample/src/generated/b.ts diff --git a/ui2abc/sample/libsample/build/generated/c.ts b/ui2abc/sample/libsample/build/generated/src/c.ts similarity index 68% rename from ui2abc/sample/libsample/build/generated/c.ts rename to ui2abc/sample/libsample/build/generated/src/c.ts index 5e11d9747..4339e928c 100644 --- a/ui2abc/sample/libsample/build/generated/c.ts +++ b/ui2abc/sample/libsample/build/generated/src/c.ts @@ -1,4 +1,4 @@ -import { b_data } from '../../src/b' +import { b_data } from './b' export function c_calc(a: number): number { return a * a + b_data(a * 3) diff --git a/ui2abc/sample/libsample/build/generated/src/peers/d.ts b/ui2abc/sample/libsample/build/generated/src/peers/d.ts new file mode 100644 index 000000000..f39a34e54 --- /dev/null +++ b/ui2abc/sample/libsample/build/generated/src/peers/d.ts @@ -0,0 +1,2 @@ +export function d_foo(i: number): void { +} diff --git a/ui2abc/sample/libsample/src/a.ts b/ui2abc/sample/libsample/src/a.ts index 47975a7af..d38573425 100644 --- a/ui2abc/sample/libsample/src/a.ts +++ b/ui2abc/sample/libsample/src/a.ts @@ -1,4 +1,5 @@ -import { c_calc } from '../build/generated/c' +import { c_calc } from './c' +import { d_foo } from "./peers/d"; export function a_foo(i: number): void { console.log(`a_foo: i=${i}`); diff --git a/ui2abc/sample/libsample/src/generated/b.ts b/ui2abc/sample/libsample/src/generated/b.ts new file mode 100644 index 000000000..5214d3c00 --- /dev/null +++ b/ui2abc/sample/libsample/src/generated/b.ts @@ -0,0 +1,4 @@ +export function b_data(init: number): number { + console.log(`b_data: init=${init}`); + return init * init +} -- Gitee From 520e37aa7fb2235ba9f9990a9940f895e1a0024f Mon Sep 17 00:00:00 2001 From: "evgeniy.generalov" Date: Tue, 26 Aug 2025 10:09:46 +0300 Subject: [PATCH 4/8] Output --- ui2abc/libarkts/rollup.lib.mjs | 2 +- ui2abc/sample/libsample/lib/build/generated/c.d.ts | 2 -- .../sample/libsample/lib/build/generated/c.d.ts.map | 1 - .../libsample/lib/build/generated/{ => src}/c.js | 2 +- .../libsample/lib/build/generated/src/peers/d.d.ts | 2 ++ .../lib/build/generated/src/peers/d.d.ts.map | 1 + .../libsample/lib/build/generated/src/peers/d.js | 6 ++++++ ui2abc/sample/libsample/lib/src/a.d.ts.map | 2 +- ui2abc/sample/libsample/lib/src/a.js | 2 +- ui2abc/sample/libsample/tsconfig.json | 13 +++++++++---- 10 files changed, 22 insertions(+), 11 deletions(-) delete mode 100644 ui2abc/sample/libsample/lib/build/generated/c.d.ts delete mode 100644 ui2abc/sample/libsample/lib/build/generated/c.d.ts.map rename ui2abc/sample/libsample/lib/build/generated/{ => src}/c.js (84%) create mode 100644 ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts create mode 100644 ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts.map create mode 100644 ui2abc/sample/libsample/lib/build/generated/src/peers/d.js diff --git a/ui2abc/libarkts/rollup.lib.mjs b/ui2abc/libarkts/rollup.lib.mjs index 6a17260d3..3f7fa8335 100644 --- a/ui2abc/libarkts/rollup.lib.mjs +++ b/ui2abc/libarkts/rollup.lib.mjs @@ -42,7 +42,7 @@ function makeConfig(input, output) { sourcemap: ENABLE_SOURCE_MAPS }, plugins: [ - commonjs(), + //commonjs(), typescript({ outputToFilesystem: false, outDir: "lib", diff --git a/ui2abc/sample/libsample/lib/build/generated/c.d.ts b/ui2abc/sample/libsample/lib/build/generated/c.d.ts deleted file mode 100644 index e1d93ed5d..000000000 --- a/ui2abc/sample/libsample/lib/build/generated/c.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export declare function c_calc(a: number): number; -//# sourceMappingURL=c.d.ts.map \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/build/generated/c.d.ts.map b/ui2abc/sample/libsample/lib/build/generated/c.d.ts.map deleted file mode 100644 index 7309bd0b8..000000000 --- a/ui2abc/sample/libsample/lib/build/generated/c.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"c.d.ts","sourceRoot":"","sources":["../../../build/generated/c.ts"],"names":[],"mappings":"AAEA,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExC"} \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/build/generated/c.js b/ui2abc/sample/libsample/lib/build/generated/src/c.js similarity index 84% rename from ui2abc/sample/libsample/lib/build/generated/c.js rename to ui2abc/sample/libsample/lib/build/generated/src/c.js index 72f4ba3fe..cff9a10f4 100644 --- a/ui2abc/sample/libsample/lib/build/generated/c.js +++ b/ui2abc/sample/libsample/lib/build/generated/src/c.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c_calc = void 0; -const b_1 = require("../../src/b"); +const b_1 = require("./b"); function c_calc(a) { return a * a + (0, b_1.b_data)(a * 3); } diff --git a/ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts b/ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts new file mode 100644 index 000000000..4e86c1787 --- /dev/null +++ b/ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts @@ -0,0 +1,2 @@ +export declare function d_foo(i: number): void; +//# sourceMappingURL=d.d.ts.map \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts.map b/ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts.map new file mode 100644 index 000000000..e3cae8071 --- /dev/null +++ b/ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts.map @@ -0,0 +1 @@ +{"version":3,"file":"d.d.ts","sourceRoot":"","sources":["../../../../../build/generated/src/peers/d.ts"],"names":[],"mappings":"AAAA,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CACrC"} \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/build/generated/src/peers/d.js b/ui2abc/sample/libsample/lib/build/generated/src/peers/d.js new file mode 100644 index 000000000..07172af54 --- /dev/null +++ b/ui2abc/sample/libsample/lib/build/generated/src/peers/d.js @@ -0,0 +1,6 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.d_foo = void 0; +function d_foo(i) { +} +exports.d_foo = d_foo; diff --git a/ui2abc/sample/libsample/lib/src/a.d.ts.map b/ui2abc/sample/libsample/lib/src/a.d.ts.map index 630eb669f..063d1bea4 100644 --- a/ui2abc/sample/libsample/lib/src/a.d.ts.map +++ b/ui2abc/sample/libsample/lib/src/a.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"a.d.ts","sourceRoot":"","sources":["../../src/a.ts"],"names":[],"mappings":"AAEA,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAGrC"} \ No newline at end of file +{"version":3,"file":"a.d.ts","sourceRoot":"","sources":["../../src/a.ts"],"names":[],"mappings":"AAGA,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAGrC"} \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/src/a.js b/ui2abc/sample/libsample/lib/src/a.js index e2764b7fe..81150882a 100644 --- a/ui2abc/sample/libsample/lib/src/a.js +++ b/ui2abc/sample/libsample/lib/src/a.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a_foo = void 0; -const c_1 = require("../build/generated/c"); +const c_1 = require("./c"); function a_foo(i) { console.log(`a_foo: i=${i}`); console.log(`a_foo: result=${(0, c_1.c_calc)(i)}`); diff --git a/ui2abc/sample/libsample/tsconfig.json b/ui2abc/sample/libsample/tsconfig.json index 8d4e45e47..ed1526c7a 100644 --- a/ui2abc/sample/libsample/tsconfig.json +++ b/ui2abc/sample/libsample/tsconfig.json @@ -6,9 +6,15 @@ "module": "commonjs", "moduleResolution": "node", - "rootDir": ".", + //"rootDir": ".", "baseUrl": ".", + "rootDirs": [ + "./src", + "./build/generated/src" + ], + //"typeRoots": [], + "declaration": true, "declarationMap": true, "outDir": "./lib", @@ -20,7 +26,8 @@ "files": [ "./src/a.ts", "./src/b.ts", - "./build/generated/c.ts" + "./build/generated/src/c.ts", + "./build/generated/src/peers/d.ts" ] } // "isolatedModules": true, @@ -36,7 +43,5 @@ // "moduleDetection": "auto", // "paths": {}, - // "rootDirs": [], - // "typeRoots": [], // "types": [], // "resolveJsonModule": true, -- Gitee From fba29d2c25bd84f777ac4a28885d9e85100e7a99 Mon Sep 17 00:00:00 2001 From: "evgeniy.generalov" Date: Tue, 26 Aug 2025 10:20:14 +0300 Subject: [PATCH 5/8] rootDirs remove immediate dir --- ui2abc/sample/libsample/build/generated/{src => }/c.ts | 0 .../sample/libsample/build/generated/{src => }/peers/d.ts | 0 ui2abc/sample/libsample/tsconfig.json | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename ui2abc/sample/libsample/build/generated/{src => }/c.ts (100%) rename ui2abc/sample/libsample/build/generated/{src => }/peers/d.ts (100%) diff --git a/ui2abc/sample/libsample/build/generated/src/c.ts b/ui2abc/sample/libsample/build/generated/c.ts similarity index 100% rename from ui2abc/sample/libsample/build/generated/src/c.ts rename to ui2abc/sample/libsample/build/generated/c.ts diff --git a/ui2abc/sample/libsample/build/generated/src/peers/d.ts b/ui2abc/sample/libsample/build/generated/peers/d.ts similarity index 100% rename from ui2abc/sample/libsample/build/generated/src/peers/d.ts rename to ui2abc/sample/libsample/build/generated/peers/d.ts diff --git a/ui2abc/sample/libsample/tsconfig.json b/ui2abc/sample/libsample/tsconfig.json index ed1526c7a..208b3443c 100644 --- a/ui2abc/sample/libsample/tsconfig.json +++ b/ui2abc/sample/libsample/tsconfig.json @@ -11,7 +11,7 @@ "rootDirs": [ "./src", - "./build/generated/src" + "./build/generated" ], //"typeRoots": [], @@ -26,8 +26,8 @@ "files": [ "./src/a.ts", "./src/b.ts", - "./build/generated/src/c.ts", - "./build/generated/src/peers/d.ts" + "./build/generated/c.ts", + "./build/generated/peers/d.ts" ] } // "isolatedModules": true, -- Gitee From a95eeac1bd94bdc45036ad3575690a5507d7a08a Mon Sep 17 00:00:00 2001 From: "evgeniy.generalov" Date: Tue, 26 Aug 2025 10:20:43 +0300 Subject: [PATCH 6/8] Output --- ui2abc/sample/libsample/lib/build/generated/c.d.ts | 2 ++ ui2abc/sample/libsample/lib/build/generated/c.d.ts.map | 1 + ui2abc/sample/libsample/lib/build/generated/{src => }/c.js | 0 .../sample/libsample/lib/build/generated/{src => }/peers/d.d.ts | 0 .../libsample/lib/build/generated/{src => }/peers/d.d.ts.map | 2 +- .../sample/libsample/lib/build/generated/{src => }/peers/d.js | 0 6 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 ui2abc/sample/libsample/lib/build/generated/c.d.ts create mode 100644 ui2abc/sample/libsample/lib/build/generated/c.d.ts.map rename ui2abc/sample/libsample/lib/build/generated/{src => }/c.js (100%) rename ui2abc/sample/libsample/lib/build/generated/{src => }/peers/d.d.ts (100%) rename ui2abc/sample/libsample/lib/build/generated/{src => }/peers/d.d.ts.map (35%) rename ui2abc/sample/libsample/lib/build/generated/{src => }/peers/d.js (100%) diff --git a/ui2abc/sample/libsample/lib/build/generated/c.d.ts b/ui2abc/sample/libsample/lib/build/generated/c.d.ts new file mode 100644 index 000000000..e1d93ed5d --- /dev/null +++ b/ui2abc/sample/libsample/lib/build/generated/c.d.ts @@ -0,0 +1,2 @@ +export declare function c_calc(a: number): number; +//# sourceMappingURL=c.d.ts.map \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/build/generated/c.d.ts.map b/ui2abc/sample/libsample/lib/build/generated/c.d.ts.map new file mode 100644 index 000000000..7309bd0b8 --- /dev/null +++ b/ui2abc/sample/libsample/lib/build/generated/c.d.ts.map @@ -0,0 +1 @@ +{"version":3,"file":"c.d.ts","sourceRoot":"","sources":["../../../build/generated/c.ts"],"names":[],"mappings":"AAEA,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExC"} \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/build/generated/src/c.js b/ui2abc/sample/libsample/lib/build/generated/c.js similarity index 100% rename from ui2abc/sample/libsample/lib/build/generated/src/c.js rename to ui2abc/sample/libsample/lib/build/generated/c.js diff --git a/ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts b/ui2abc/sample/libsample/lib/build/generated/peers/d.d.ts similarity index 100% rename from ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts rename to ui2abc/sample/libsample/lib/build/generated/peers/d.d.ts diff --git a/ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts.map b/ui2abc/sample/libsample/lib/build/generated/peers/d.d.ts.map similarity index 35% rename from ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts.map rename to ui2abc/sample/libsample/lib/build/generated/peers/d.d.ts.map index e3cae8071..112956c1b 100644 --- a/ui2abc/sample/libsample/lib/build/generated/src/peers/d.d.ts.map +++ b/ui2abc/sample/libsample/lib/build/generated/peers/d.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"d.d.ts","sourceRoot":"","sources":["../../../../../build/generated/src/peers/d.ts"],"names":[],"mappings":"AAAA,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CACrC"} \ No newline at end of file +{"version":3,"file":"d.d.ts","sourceRoot":"","sources":["../../../../build/generated/peers/d.ts"],"names":[],"mappings":"AAAA,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CACrC"} \ No newline at end of file diff --git a/ui2abc/sample/libsample/lib/build/generated/src/peers/d.js b/ui2abc/sample/libsample/lib/build/generated/peers/d.js similarity index 100% rename from ui2abc/sample/libsample/lib/build/generated/src/peers/d.js rename to ui2abc/sample/libsample/lib/build/generated/peers/d.js -- Gitee From 45eae388a36cace4544292a7b0d42e2af2528492 Mon Sep 17 00:00:00 2001 From: "evgeniy.generalov" Date: Tue, 26 Aug 2025 14:38:27 +0300 Subject: [PATCH 7/8] App sample --- ui2abc/sample/appsample/package.json | 13 +++++++++++++ ui2abc/sample/appsample/src/main.ts | 6 ++++++ ui2abc/sample/appsample/tsconfig.json | 23 +++++++++++++++++++++++ ui2abc/sample/package.json | 23 +++++++++++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 ui2abc/sample/appsample/package.json create mode 100644 ui2abc/sample/appsample/src/main.ts create mode 100644 ui2abc/sample/appsample/tsconfig.json create mode 100644 ui2abc/sample/package.json diff --git a/ui2abc/sample/appsample/package.json b/ui2abc/sample/appsample/package.json new file mode 100644 index 000000000..7bbe113c3 --- /dev/null +++ b/ui2abc/sample/appsample/package.json @@ -0,0 +1,13 @@ +{ + "name": "appsample", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [], + "author": "", + "license": "ISC", + "type": "commonjs" +} diff --git a/ui2abc/sample/appsample/src/main.ts b/ui2abc/sample/appsample/src/main.ts new file mode 100644 index 000000000..6f71679a0 --- /dev/null +++ b/ui2abc/sample/appsample/src/main.ts @@ -0,0 +1,6 @@ +import { a_foo as a_foo2 } from "libsample/a" +import { c_calc } from "libsample/c" +import { d_foo } from "libsample/peers/d" + +a_foo2(5) +d_foo(5) diff --git a/ui2abc/sample/appsample/tsconfig.json b/ui2abc/sample/appsample/tsconfig.json new file mode 100644 index 000000000..b4d000b4c --- /dev/null +++ b/ui2abc/sample/appsample/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "target": "es2016", + "incremental": true, + "composite": true, + + "module": "commonjs", + "moduleResolution": "node", + "rootDir": "./src", + "baseUrl": "./src", + + "declaration": true, + "declarationMap": true, + "outDir": "./lib", + "esModuleInterop": true, + + "strict": true, + "skipLibCheck": true + }, + "files": [ + "./src/main.ts" + ] +} diff --git a/ui2abc/sample/package.json b/ui2abc/sample/package.json new file mode 100644 index 000000000..f58156c47 --- /dev/null +++ b/ui2abc/sample/package.json @@ -0,0 +1,23 @@ +{ + "name": "sample", + "version": "1.0.0", + "description": "", + + "type": "commonjs", + "main": "index.js", + + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [], + "author": "", + "license": "ISC", + + "workspaces": [ + "libsample", "appsample" + ], + + "devDependencies": { + "typescript": "^4.9.5" + } +} -- Gitee From 48ca8cc0ed8af2a3d4e612893b7d8770c455d210 Mon Sep 17 00:00:00 2001 From: "evgeniy.generalov" Date: Tue, 26 Aug 2025 14:39:05 +0300 Subject: [PATCH 8/8] Add types version --- ui2abc/sample/libsample/package.json | 30 ++++++++++++++++------------ 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/ui2abc/sample/libsample/package.json b/ui2abc/sample/libsample/package.json index 979e14c59..d750483b4 100644 --- a/ui2abc/sample/libsample/package.json +++ b/ui2abc/sample/libsample/package.json @@ -6,14 +6,22 @@ "type": "commonjs", "main": "index.js", - "unused_export": { - ".": { - "types" : "./lib/*.d.ts", - "default": "./lib/index.js" - }, - "./generated/*" : { - "types" : "./lib/build/generated/*.d.ts", - "default": "./lib/build/generated/index.js" + "typesVersions" : { + "*": { + "*": [ + "./lib/src/*.d.ts", + "./lib/build/generated/*.d.ts" + ] + } + }, + + "exports": { + "./*": { + "types" : "./lib/src/*.d.ts", + "default": [ + "./lib/src/*.js", + "./lib/build/generated/*.js" + ] } }, @@ -22,9 +30,5 @@ }, "keywords": [], "author": "", - "license": "ISC", - - "devDependencies": { - "typescript": "^4.9.5" - } + "license": "ISC" } -- Gitee