@idlizer/arktscgen 2.1.10-arktscgen-6 → 2.1.10-arktscgen-7

package/lib/index.js

@@ -261,6 +261,9 @@ function isReferenceType(type) {
 function isEnum(type) {
     return type.kind == IDLKind.Enum;
 }
+function isEnumMember(type) {
+    return type.kind == IDLKind.EnumMember;
+}
 function isUnionType(type) {
     return type.kind == IDLKind.UnionType;
 }
@@ -1566,11 +1569,144 @@ function convertType(convertor, type) {
         return convertor.convertPrimitiveType(type);
     throw new Error(`Unknown type ${IDLKind[type.kind]}`);
 }
+function convertDeclaration(convertor, decl) {
+    if (isImport(decl))
+        return convertor.convertImport(decl);
+    if (isNamespace(decl))
+        return convertor.convertNamespace(decl);
+    if (isInterface(decl))
+        return convertor.convertInterface(decl);
+    if (isEnum(decl))
+        return convertor.convertEnum(decl);
+    if (isEnumMember(decl))
+        return convertor.convertEnum(decl.parent);
+    if (isTypedef(decl))
+        return convertor.convertTypedef(decl);
+    if (isCallback(decl))
+        return convertor.convertCallback(decl);
+    if (isMethod(decl))
+        return convertor.convertMethod(decl);
+    if (isConstant(decl))
+        return convertor.convertConstant(decl);
+    throw new Error(`Unknown declaration type ${decl.kind ? IDLKind[decl.kind] : "(undefined kind)"}`);
+}
 function withInsideInstanceof(isInsideInstanceof, op) {
     const result = op();
     return result;
 }
 
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class DeclarationNameConvertor {
+    convertImport(decl) {
+        console.warn("Imports are not implemented yet");
+        return decl.name;
+    }
+    convertInterface(decl) {
+        return decl.name;
+    }
+    convertEnum(decl) {
+        return `${getNamespacesPathFor(decl).join('')}${decl.name}`;
+    }
+    convertTypedef(decl) {
+        return decl.name;
+    }
+    convertCallback(decl) {
+        var _a;
+        return (_a = decl.name) !== null && _a !== void 0 ? _a : "MISSING CALLBACK NAME";
+    }
+    convertNamespace(node) {
+        return node.name;
+    }
+    convertMethod(node) {
+        return node.name;
+    }
+    convertConstant(node) {
+        return node.name;
+    }
+}
+DeclarationNameConvertor.I = new DeclarationNameConvertor();
+class TSFeatureNameConvertor extends DeclarationNameConvertor {
+    convertEnum(decl) {
+        const namespace = getNamespacesPathFor(decl).map(it => it.name);
+        if (namespace.length > 0)
+            return namespace[0];
+        return decl.name;
+    }
+}
+TSFeatureNameConvertor.I = new TSFeatureNameConvertor();
+class ETSDeclarationNameConvertor extends DeclarationNameConvertor {
+    convertInterface(decl) {
+        return getQualifiedName(decl, "namespace.name");
+    }
+    convertEnum(decl) {
+        return getQualifiedName(decl, "namespace.name");
+    }
+}
+ETSDeclarationNameConvertor.I = new ETSDeclarationNameConvertor();
+class CJDeclarationNameConvertor extends DeclarationNameConvertor {
+    convertInterface(decl) {
+        return decl.name;
+    }
+    convertEnum(decl) {
+        return decl.name;
+    }
+}
+CJDeclarationNameConvertor.I = new CJDeclarationNameConvertor();
+class KotlinDeclarationNameConvertor extends DeclarationNameConvertor {
+    convertInterface(decl) {
+        return removePoints(getQualifiedName(decl, "namespace.name"));
+    }
+    convertEnum(decl) {
+        return removePoints(getQualifiedName(decl, "namespace.name"));
+    }
+}
+KotlinDeclarationNameConvertor.I = new KotlinDeclarationNameConvertor();
+class ETSFeatureNameConvertor extends DeclarationNameConvertor {
+    convertEnum(decl) {
+        const namespace = getNamespacesPathFor(decl).map(it => it.name);
+        if (namespace.length > 0)
+            return namespace[0];
+        return decl.name;
+    }
+}
+ETSFeatureNameConvertor.I = new ETSFeatureNameConvertor();
+class CJFeatureNameConvertor extends DeclarationNameConvertor {
+    convertEnum(decl) {
+        return decl.name;
+    }
+}
+CJFeatureNameConvertor.I = new CJFeatureNameConvertor();
+class KotlinFeatureNameConvertor extends DeclarationNameConvertor {
+    convertInterface(decl) {
+        return removePoints(getQualifiedName(decl, "namespace.name"));
+    }
+    convertEnum(decl) {
+        return removePoints(getQualifiedName(decl, "namespace.name"));
+    }
+}
+KotlinFeatureNameConvertor.I = new KotlinFeatureNameConvertor();
+function createDeclarationNameConvertor(language) {
+    switch (language) {
+        case Language.ARKTS: return ETSDeclarationNameConvertor.I;
+        case Language.CPP:
+        case Language.TS: return DeclarationNameConvertor.I;
+        case Language.CJ:        case Language.KOTLIN:        default: throw new Error(`Language ${language.toString()} is not supported`);
+    }
+}
+
 /*
  * Copyright (c) 2024 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1796,28 +1932,33 @@ class TsEnumEntityStatement {
         this.options = options;
     }
     write(writer) {
-        // writer.print(this.enumEntity.comment)
-        writer.print(`${this.options.isExport ? "export " : ""}${this.options.isDeclare ? "declare " : ""}enum ${this.enumEntity.name} {`);
-        writer.pushIndent();
+        let enumName = convertDeclaration(createDeclarationNameConvertor(Language.ARKTS), this.enumEntity);
+        enumName = enumName.split('.').at(-1);
+        const correctStyleNames = [];
+        const originalStyleNames = [];
         this.enumEntity.elements.forEach((member, index) => {
-            // writer.print(member.comment)
-            const initValue = member.initializer
-                ? ` = ${this.maybeQuoted(member.initializer)}` : ``;
-            writer.print(`${member.name}${initValue},`);
-            let originalName = getExtAttribute(member, IDLExtendedAttributes.OriginalEnumMemberName);
-            if (originalName) {
-                const initValue = ` = ${member.name}`;
-                writer.print(`${originalName}${initValue},`);
-            }
+            var _a;
+            const initText = (_a = member.initializer) !== null && _a !== void 0 ? _a : index;
+            const isTypeString = typeof initText !== "number";
+            const originalName = getExtAttribute(member, IDLExtendedAttributes.OriginalEnumMemberName);
+            correctStyleNames.push({
+                name: originalName ? member.name : `${member.name}_DUMMY`,
+                alias: undefined,
+                stringId: isTypeString ? initText : undefined,
+                numberId: initText
+            });
+            originalStyleNames.push({
+                name: originalName !== null && originalName !== void 0 ? originalName : member.name,
+                alias: undefined,
+                stringId: isTypeString ? initText : undefined,
+                numberId: initText
+            });
         });
-        writer.popIndent();
-        writer.print(`}`);
-    }
-    maybeQuoted(value) {
-        if (typeof value == "string")
-            return `"${value}"`;
-        else
-            return `${value}`;
+        let members = originalStyleNames;
+        if (this.enumEntity.elements.some(it => hasExtAttribute(it, IDLExtendedAttributes.OriginalEnumMemberName))) {
+            members = members.concat(correctStyleNames);
+        }
+        writer.writeEnum(enumName, members, { isExport: this.options.isExport, isDeclare: this.options.isDeclare });
     }
 }
 class ReturnStatement {
@@ -5024,8 +5165,15 @@ class TSLanguageWriter extends LanguageWriter {
     }
     i32FromEnum(value, enumEntry) {
         const enumName = this.getNodeName(enumEntry);
-        if (isEnum(enumEntry) && isStringEnum(enumEntry)) {
-            return this.makeString(`Object.values(${enumName}).indexOf(${value.asString()})`);
+        if (isStringEnum(enumEntry)) {
+            let extractorStatement = this.makeString(`Object.values(${enumName}).indexOf(${value.asString()})`);
+            if (enumEntry.elements.some(it => hasExtAttribute(it, IDLExtendedAttributes.OriginalEnumMemberName))) {
+                extractorStatement = this.makeNaryOp('%', [
+                    extractorStatement,
+                    this.makeString(enumEntry.elements.length.toString())
+                ]);
+            }
+            return extractorStatement;
         }
         return this.makeString(`${value.asString()}.valueOf()`);
     }
@@ -5103,6 +5251,9 @@ function rightmostIndexOf(array, predicate) {
     });
     return result;
 }
+function removePoints(s) {
+    return s.split(/[\.\-]/g).join('_');
+}
 
 /*
  * Copyright (c) 2025 Huawei Device Co., Ltd.
@@ -7115,10 +7266,10 @@ class BridgesConstructions {
         return `result`;
     }
     static stringConstructor(name) {
-        return `StageArena::strdup(${name})`;
+        return `StageArena::Strdup(${name})`;
     }
     static sequenceConstructor(first, length) {
-        return `StageArena::cloneVector(${first}, ${length})`;
+        return `StageArena::CloneVector(${first}, ${length})`;
     }
     static referenceTypeCast(type) {
         return `reinterpret_cast<${type}>`;
@@ -7391,6 +7542,10 @@ function nodeNamespace(node) {
     var _a;
     return (_a = getNamespacesPathFor(node)[0]) === null || _a === void 0 ? void 0 : _a.name;
 }
+/**
+ * Returns a fully qualified name for a node with no exceptions.
+ * @note Primarily used to pass a name to Config' options.
+*/
 function fqName(node) {
     return getQualifiedName(node, "namespace.name");
 }
@@ -7469,6 +7624,26 @@ function flatParentsImpl(ref, resolveReference) {
     }
     return result; // with self
 }
+/**
+ * A fully qualified of a type that reference points to.
+ * @note 'ir' namespace is ignored and treated as global namespace.
+ */
+function makeFullyQualifiedName(ref, resolveReference) {
+    const decl = resolveReference(ref);
+    if (!decl) {
+        return ref.name;
+    }
+    return getNamespacesPathFor(decl)
+        .filter(n => n.name !== Config.irNamespace)
+        .map(n => n.name)
+        .concat(decl.name)
+        .join('.');
+}
+/**
+ * If namespaces of the reference and resolved declaration
+ * are the same, non-qualified name is returned. Otherwise, a fully qualified.
+ * @note 'ir' namespace is ignored and treated as global namespace.
+ */
 function makeEnoughQualifiedName(ref, resolveReference) {
     const decl = resolveReference(ref);
     if (!decl) {
@@ -8436,8 +8611,7 @@ class PeersConstructions {
  * limitations under the License.
  */
 class Importer {
-    constructor(typechecker, dir, self) {
-        this.typechecker = typechecker;
+    constructor(dir, self) {
         this.dir = dir;
         this.writer = createDefaultTypescriptWriter();
         this.seen = new Set([
@@ -8448,11 +8622,11 @@ class Importer {
             this.seen.add(self);
         }
     }
-    withPeerImport(ref, context) {
-        const name = makeEnoughQualifiedName(ref, this.typechecker.resolveReference.bind(this.typechecker));
+    withPeerImport(name) {
         const fq = name.split('.');
         // import namespace name for fq names
-        return this.withPeerImport2(fq.length > 1 ? fq.slice(0, -1).join('.') : name);
+        this.withPeerImport2(fq.length > 1 ? fq.slice(0, -1).join('.') : name);
+        return name;
     }
     withPeerImport2(it) {
         if (this.seen.has(it)) {
@@ -8799,9 +8973,10 @@ class PeerPrinter {
     printPeer(iface, writer) {
         var _a;
         const _parent = (_a = iface.inheritance[0]) !== null && _a !== void 0 ? _a : createReferenceType(Config.defaultAncestor);
+        const parentName = makeEnoughQualifiedName(_parent, this.typechecker.resolveReference.bind(this.typechecker));
         this.importer.addSeen(PeersConstructions.peerName(iface.name));
         writer.writeClass(PeersConstructions.peerName(iface.name), // XXX: Change peer name to iface.name
-        (writer) => this.printBody(iface, writer), this.importer.withPeerImport(_parent));
+        (writer) => this.printBody(iface, writer), this.importer.withPeerImport(parentName));
     }
     printBody(iface, writer) {
         this.printConstructor(iface, writer);
@@ -9028,7 +9203,7 @@ function convertAndImport(importer, converter, type, config) {
                 importer.withReexportImport(dropPrefix(type.name, Config.dataClassPrefix));
             }
             else {
-                importer.withPeerImport(type);
+                importer.withPeerImport(result);
             }
         }
     }
@@ -9066,6 +9241,10 @@ class _LibraryTypeConvertor extends TopLevelTypeConvertor {
     }
 }
 class LibraryTypeConvertor extends _LibraryTypeConvertor {
+    constructor(typechecker, fullQualified = false) {
+        super(typechecker);
+        this.fullQualified = fullQualified;
+    }
     convertTypeReference(type) {
         const node = this.typechecker.resolveReference(type);
         if (node && isEnum(node)) {
@@ -9074,7 +9253,10 @@ class LibraryTypeConvertor extends _LibraryTypeConvertor {
                 return `Es2panda${node.name.slice(Config.dataClassPrefix.length)}`;
             }
         }
-        return makeEnoughQualifiedName(type, this.typechecker.resolveReference.bind(this.typechecker));
+        const resolver = this.typechecker.resolveReference.bind(this.typechecker);
+        return this.fullQualified
+            ? makeFullyQualifiedName(type, resolver)
+            : makeEnoughQualifiedName(type, resolver);
     }
 }
 
@@ -9128,7 +9310,7 @@ class AllPeersPrinter extends MultiFilePrinter {
         return this.printFile(iface.name, ['*'], (printer, writer) => printer.printInterface(iface, writer));
     }
     printFile(name, exports, cb) {
-        const importer = new Importer(this.typechecker, '.', name);
+        const importer = new Importer('.', name);
         const writer = this.makeWriter(importer);
         const printer = new PeerPrinter(this.config, this.typechecker, importer);
         cb(printer, writer);
@@ -9244,8 +9426,8 @@ class FactoryPrinter extends SingleFilePrinter {
     constructor(config, idl) {
         super(idl);
         this.config = config;
-        this.importer = new Importer(this.typechecker, `peers`);
-        this.converter = new LibraryTypeConvertor(this.typechecker);
+        this.importer = new Importer(`peers`);
+        this.converter = new LibraryTypeConvertor(this.typechecker, true /* fq names */);
         this.writer = new TSLanguageWriter(new IndentedPrinter(), createEmptyReferenceResolver(), {
             convert: (node) => convertAndImport(this.importer, this.converter, node, this.config)
         });
@@ -9530,7 +9712,7 @@ class DynamicEmitter {
         this.generatorVersion = `Unknown`;
         this.logDir = `./out/log-idl`;
         this.logCount = 0;
-        this.bridgesPrinter = new SingleFileEmitter((idl) => new BridgesPrinter(this.config, idl).print(), `libarkts/generated/native/bridges.cc`, `bridges.cc`, true);
+        this.bridgesPrinter = new SingleFileEmitter((idl) => new BridgesPrinter(this.config, idl).print(), `libarkts/generated/native/bridges.cpp`, `bridges.cpp`, true);
         this.bindingsPrinter = new SingleFileEmitter((idl) => new BindingsPrinter(idl).print(), `libarkts/generated/Es2pandaNativeModule.ts`, `Es2pandaNativeModule.ts`, true);
         this.enumsPrinter = new SingleFileEmitter((idl) => new EnumsPrinter(idl).print(), `libarkts/generated/Es2pandaEnums.ts`, `Es2pandaEnums.ts`, true);
         this.indexPrinter = new SingleFileEmitter((idl) => new IndexPrinter(this.config, idl).print(), // overriden below

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@idlizer/arktscgen",
-    "version": "2.1.10-arktscgen-6",
+    "version": "2.1.10-arktscgen-7",
     "description": "",
     "main": "lib/index.js",
     "bin": "lib/index.js",
@@ -18,7 +18,7 @@
     "license": "Apache-2.0",
     "keywords": [],
     "dependencies": {
-        "@idlizer/core": "2.1.10-arktscgen-6",
+        "@idlizer/core": "2.1.10-arktscgen-7",
         "@types/node": "^18.0.0",
         "commander": "^10.0.0",
         "typescript": "^4.9.5"

package/templates/{bridges.cc → bridges.cpp}

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

package/build/libarkts-copy/src/arkts-api/node-utilities/Program.ts

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Program } from '../../../generated';
-import { traceGlobal } from '../../tracer';
-
-export function dumpProgramInfo(program: Program) {
-    traceGlobal(() => `Program info:`);
-    traceGlobal(() => `\tAbsoluteName:          ${program.absoluteName}`);
-    traceGlobal(() => `\tFileName:              ${program.fileName}`);
-    traceGlobal(() => `\tFileNameWithExtension: ${program.fileNameWithExtension}`);
-    traceGlobal(() => `\tModuleName:            ${program.moduleName}`);
-    traceGlobal(() => `\tModulePrefix:          ${program.modulePrefix}`);
-    traceGlobal(() => `\tRelativeFilePath:      ${program.relativeFilePath}`);
-    traceGlobal(() => `\tResolvedFilePath:      ${program.resolvedFilePath}`);
-    traceGlobal(() => `\tSourceFileFolder:      ${program.sourceFileFolder}`);
-    traceGlobal(() => `\tSourceFilePath:        ${program.sourceFilePath}`);
-}
-
-export function dumpProgramSrcFormatted(program: Program, recursive: boolean, withLines: boolean = true) {
-    const lines = program.ast.dumpSrc();
-    console.log(`// file: ${program.absoluteName}`);
-    if (withLines) {
-        console.log(
-            lines
-                .split('\n')
-                .map((it, index) => `${`${index + 1}`.padStart(4)} |${it}`)
-                .join('\n')
-        );
-    } else {
-        console.log(lines);
-    }
-}