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

package/build/lib/src/LanguageWriters/LanguageWriter.d.ts

@@ -123,7 +123,6 @@ export declare class TsEnumEntityStatement implements LanguageStatement {
         isDeclare: boolean;
     });
     write(writer: LanguageWriter): void;
-    private maybeQuoted;
 }
 export declare class ReturnStatement implements LanguageStatement {
     expression?: LanguageExpression | undefined;

package/build/lib/src/LanguageWriters/LanguageWriter.js

@@ -12,10 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { Language } from "../Language";
 import * as idl from "../idl";
 import * as fs from "fs";
 import { RuntimeType } from "./common";
-import { withInsideInstanceof } from "./nameConvertor";
+import { convertDeclaration, withInsideInstanceof } from "./nameConvertor";
+import { createDeclarationNameConvertor } from "../peer-generation/idl/IdlNameConvertor";
 export class TernaryExpression {
     constructor(condition, trueExpression, falseExpression) {
         this.condition = condition;
@@ -235,28 +237,33 @@ export 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 = idl.getExtAttribute(member, idl.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 = idl.getExtAttribute(member, idl.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 => idl.hasExtAttribute(it, idl.IDLExtendedAttributes.OriginalEnumMemberName))) {
+            members = members.concat(correctStyleNames);
+        }
+        writer.writeEnum(enumName, members, { isExport: this.options.isExport, isDeclare: this.options.isDeclare });
     }
 }
 export class ReturnStatement {

package/build/lib/src/LanguageWriters/convertors/TSConvertors.js

@@ -17,7 +17,7 @@ import { Language } from '../../Language';
 import { isTopLevelConflicted } from '../../peer-generation/ConflictingDeclarations';
 import { isDeclaredInCurrentFile, LayoutNodeRole } from '../../peer-generation/LayoutManager';
 import { maybeRestoreGenerics } from '../../transformers/GenericTransformer';
-import { convertNode, convertType, isInsideInstanceof } from '../nameConvertor';
+import { convertNode, convertType, isInsideInstanceof, withInsideInstanceof } from '../nameConvertor';
 export class TSTypeNameConvertor {
     constructor(library) {
         this.library = library;
@@ -142,7 +142,8 @@ export class TSTypeNameConvertor {
             }
             let typeSpec = type.name;
             let typeArgs = !isInsideInstanceof() || decl && idl.isCallback(decl)
-                ? (_b = (_a = type.typeArguments) === null || _a === void 0 ? void 0 : _a.map(it => this.convert(it))) !== null && _b !== void 0 ? _b : []
+                // there is a bug with panda - if we're inside callback generics, we need to expand other generics too. So withInsideInstanceof is used
+                ? (_b = (_a = type.typeArguments) === null || _a === void 0 ? void 0 : _a.map(it => withInsideInstanceof(false, () => this.convert(it)))) !== null && _b !== void 0 ? _b : []
                 : [];
             if (typeSpec === `Optional`)
                 return `${typeArgs} | undefined`;

package/build/lib/src/LanguageWriters/writers/ETSLanguageWriter.d.ts

@@ -1,7 +1,7 @@
 import { IndentedPrinter } from "../../IndentedPrinter";
 import { LambdaExpression, LanguageExpression, LanguageStatement, LanguageWriter, MakeAssignOptions, MakeCastOptions, Method, MethodModifier, MethodSignature } from "../LanguageWriter";
 import { TSLanguageWriter } from "./TsLanguageWriter";
-import { IDLEnum, IDLType } from '../../idl';
+import { IDLType } from '../../idl';
 import { ArgConvertor } from "../ArgConvertors";
 import * as idl from '../../idl';
 import { IdlNameConvertor } from "../nameConvertor";
@@ -23,15 +23,6 @@ export declare class EtsAssignStatement implements LanguageStatement {
     constructor(variableName: string, type: IDLType | undefined, expression: LanguageExpression, isDeclared?: boolean, isConst?: boolean, options?: MakeAssignOptions | undefined);
     write(writer: LanguageWriter): void;
 }
-export declare class ArkTSEnumEntityStatement implements LanguageStatement {
-    private readonly enumEntity;
-    private readonly options;
-    constructor(enumEntity: IDLEnum, options: {
-        isExport: boolean;
-        isDeclare: boolean;
-    });
-    write(writer: LanguageWriter): void;
-}
 export declare class ETSLambdaExpression extends LambdaExpression {
     private convertor;
     constructor(writer: LanguageWriter, convertor: IdlNameConvertor, signature: MethodSignature, resolver: ReferenceResolver, body?: LanguageStatement[]);
@@ -60,10 +51,6 @@ export declare class ETSLanguageWriter extends TSLanguageWriter {
         targetType: (writer: LanguageWriter) => string;
     }, value: string, accessors: string[], duplicates: Set<string>): LanguageExpression;
     makeValueFromOption(value: string, destinationConvertor: ArgConvertor): LanguageExpression;
-    makeEnumEntity(enumEntity: IDLEnum, options: {
-        isExport: boolean;
-        isDeclare?: boolean;
-    }): LanguageStatement;
     writeMethodCall(receiver: string, method: string, params: string[], nullable?: boolean): void;
     isQuickType(type: IDLType): boolean;
     writeNativeMethodDeclaration(method: Method): void;

package/build/lib/src/LanguageWriters/writers/ETSLanguageWriter.js

@@ -15,11 +15,10 @@
 import { IndentedPrinter } from "../../IndentedPrinter";
 import { BlockStatement, LambdaExpression, MethodModifier } from "../LanguageWriter";
 import { TSCastExpression, TSLanguageWriter } from "./TsLanguageWriter";
-import { getExtAttribute, IDLThisType } from '../../idl';
+import { IDLThisType } from '../../idl';
 import { AggregateConvertor, CustomTypeConvertor, InterfaceConvertor, MaterializedClassConvertor } from "../ArgConvertors";
 import * as idl from '../../idl';
-import { convertDeclaration, withInsideInstanceof } from "../nameConvertor";
-import { createDeclarationNameConvertor } from "../../peer-generation/idl/IdlNameConvertor";
+import { withInsideInstanceof } from "../nameConvertor";
 import { Language } from "../../Language";
 ////////////////////////////////////////////////////////////////
 //                        EXPRESSIONS                         //
@@ -82,41 +81,6 @@ class ArkTSMapForEachStatement {
         writer.print(`}`);
     }
 }
-export class ArkTSEnumEntityStatement {
-    constructor(enumEntity, options) {
-        this.enumEntity = enumEntity;
-        this.options = options;
-    }
-    write(writer) {
-        let enumName = convertDeclaration(createDeclarationNameConvertor(Language.ARKTS), this.enumEntity);
-        enumName = enumName.split('.').at(-1);
-        const correctStyleNames = [];
-        const originalStyleNames = [];
-        this.enumEntity.elements.forEach((member, index) => {
-            var _a;
-            const initText = (_a = member.initializer) !== null && _a !== void 0 ? _a : index;
-            const isTypeString = typeof initText !== "number";
-            const originalName = getExtAttribute(member, idl.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
-            });
-        });
-        let members = originalStyleNames;
-        if (this.enumEntity.elements.some(it => idl.hasExtAttribute(it, idl.IDLExtendedAttributes.OriginalEnumMemberName))) {
-            members = members.concat(correctStyleNames);
-        }
-        writer.writeEnum(enumName, members, { isExport: this.options.isExport, isDeclare: this.options.isDeclare });
-    }
-}
 export class ETSLambdaExpression extends LambdaExpression {
     constructor(writer, convertor, signature, resolver, body) {
         super(writer, signature, resolver, body);
@@ -224,12 +188,6 @@ export class ETSLanguageWriter extends TSLanguageWriter {
         }
         return super.makeValueFromOption(value, destinationConvertor);
     }
-    makeEnumEntity(enumEntity, options) {
-        return new ArkTSEnumEntityStatement(enumEntity, {
-            isExport: options === null || options === void 0 ? void 0 : options.isExport,
-            isDeclare: !!(options === null || options === void 0 ? void 0 : options.isDeclare),
-        });
-    }
     writeMethodCall(receiver, method, params, nullable = false) {
         // ArkTS does not support - 'this.?'
         super.writeMethodCall(receiver, method, params, nullable && receiver !== "this");

package/build/lib/src/LanguageWriters/writers/TsLanguageWriter.js

@@ -446,8 +446,15 @@ export class TSLanguageWriter extends LanguageWriter {
     }
     i32FromEnum(value, enumEntry) {
         const enumName = this.getNodeName(enumEntry);
-        if (idl.isEnum(enumEntry) && idl.isStringEnum(enumEntry)) {
-            return this.makeString(`Object.values(${enumName}).indexOf(${value.asString()})`);
+        if (idl.isStringEnum(enumEntry)) {
+            let extractorStatement = this.makeString(`Object.values(${enumName}).indexOf(${value.asString()})`);
+            if (enumEntry.elements.some(it => idl.hasExtAttribute(it, idl.IDLExtendedAttributes.OriginalEnumMemberName))) {
+                extractorStatement = this.makeNaryOp('%', [
+                    extractorStatement,
+                    this.makeString(enumEntry.elements.length.toString())
+                ]);
+            }
+            return extractorStatement;
         }
         return this.makeString(`${value.asString()}.valueOf()`);
     }

package/build/lib/src/transformers/GenericTransformer.js

@@ -80,7 +80,7 @@ class DefaultGenericsTransformer extends IdlTransformer {
         this.resolver = resolver;
     }
     visit(node) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (idl.isReferenceType(node)) {
             const decl = this.resolver.resolveTypeReference(node);
             if (!decl) {
@@ -91,14 +91,14 @@ class DefaultGenericsTransformer extends IdlTransformer {
                 return this.visitEachChild(node);
             }
             if (((_c = (_b = decl.typeParameters) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) > ((_e = (_d = node.typeArguments) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0)) {
-                const defaults = (_h = (_g = (_f = decl.extendedAttributes) === null || _f === void 0 ? void 0 : _f.find(it => it.name === idl.IDLExtendedAttributes.TypeParametersDefaults)) === null || _g === void 0 ? void 0 : _g.typesValue) !== null && _h !== void 0 ? _h : [];
+                const defaults = (_j = (_h = (_g = (_f = decl.extendedAttributes) === null || _f === void 0 ? void 0 : _f.find(it => it.name === idl.IDLExtendedAttributes.TypeParametersDefaults)) === null || _g === void 0 ? void 0 : _g.typesValue) === null || _h === void 0 ? void 0 : _h.slice()) !== null && _j !== void 0 ? _j : [];
                 while (defaults.length < decl.typeParameters.length) {
                     defaults.unshift(undefined);
                 }
-                const typeArguments = Array.from((_j = node.typeArguments) !== null && _j !== void 0 ? _j : []);
+                const typeArguments = Array.from((_k = node.typeArguments) !== null && _k !== void 0 ? _k : []);
                 while (decl.typeParameters.length > typeArguments.length) {
                     if (defaults[typeArguments.length] === undefined) {
-                        const declarationDetails = `${idl.getFQName(decl)}<${((_k = decl.typeParameters) !== null && _k !== void 0 ? _k : [])
+                        const declarationDetails = `${idl.getFQName(decl)}<${((_l = decl.typeParameters) !== null && _l !== void 0 ? _l : [])
                             .map((it, index) => `${it}${defaults[index] ? '=' + defaults[index] : ''}`)
                             .join(', ')}>`;
                         const referenceDetails = `${node.name}<${typeArguments.map(it => idl.printType(it)).join(", ")}>`;

package/build/lib/src/util.d.ts

@@ -18,6 +18,7 @@ export declare function snakeCaseToCamelCase(input: string, tailToLowerCase?: bo
 export declare function toCamelCase(input: string): string;
 export declare function isUpperCase(s: string): boolean;
 export declare function camelCaseToUpperSnakeCase(input: string): string;
+export declare function camelCaseToLowerSnakeCase(input: string): string;
 export declare function snakeToLowCamelNode(node: idl.IDLEntry): string;
 export declare function renameDtsToPeer(fileName: string, language: Language, withFileExtension?: boolean): string;
 export declare function renameDtsToComponent(fileName: string, language: Language, withFileExtension?: boolean): string;

package/build/lib/src/util.js

@@ -122,6 +122,9 @@ export function camelCaseToUpperSnakeCase(input) {
         .map(s => toUpperSnakeCase(s))
         .join('_');
 }
+export function camelCaseToLowerSnakeCase(input) {
+    return camelCaseToUpperSnakeCase(input).toLowerCase();
+}
 export function snakeToLowCamelNode(node) {
     if (!node.fileName) {
         throw new Error("Invalid Convert");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@idlizer/core",
-    "version": "2.1.10-arktscgen-6",
+    "version": "2.1.10-arktscgen-7",
     "description": "",
     "types": "build/lib/src/index.d.ts",
     "exports": {