@htmlplus/element 0.6.6 → 0.6.7

package/client/decorators/element.js

@@ -42,11 +42,17 @@ export function Element(tag) {
             }
             connectedCallback() {
                 const instance = this[CONSTANTS.API_INSTANCE];
-                instance[CONSTANTS.API_CONNECTED] = true;
-                call(instance, CONSTANTS.LIFECYCLE_CONNECTED);
-                request(instance, undefined, undefined, () => {
-                    call(instance, CONSTANTS.LIFECYCLE_LOADED);
-                });
+                const connect = () => {
+                    instance[CONSTANTS.API_CONNECTED] = true;
+                    call(instance, CONSTANTS.LIFECYCLE_CONNECTED);
+                    request(instance, undefined, undefined, () => {
+                        call(instance, CONSTANTS.LIFECYCLE_LOADED);
+                    });
+                };
+                const callback = call(instance, CONSTANTS.LIFECYCLE_CONNECT);
+                if (!(callback === null || callback === void 0 ? void 0 : callback.then))
+                    return connect();
+                callback.then(() => connect());
             }
             disconnectedCallback() {
                 call(this[CONSTANTS.API_INSTANCE], CONSTANTS.LIFECYCLE_DISCONNECTED);

package/compiler/plugins/customElement.js

@@ -107,6 +107,7 @@ export const customElement = (options) => {
                     return;
                 let type = 0;
                 const extract = (input) => {
+                    var _a;
                     switch (input === null || input === void 0 ? void 0 : input.type) {
                         case 'BooleanLiteral':
                             type |= CONSTANTS.TYPE_BOOLEAN;
@@ -172,8 +173,18 @@ export const customElement = (options) => {
                             input.types.forEach(extract);
                             break;
                     }
+                    // TODO
+                    if ((input === null || input === void 0 ? void 0 : input.type) == 'TSParenthesizedType' && ((_a = input === null || input === void 0 ? void 0 : input.typeAnnotation) === null || _a === void 0 ? void 0 : _a.type) == 'TSIntersectionType') {
+                        let types = input.types || input.typeAnnotation.types;
+                        if (types.length != 2)
+                            return;
+                        types = types.filter((type) => type.type != 'TSTypeLiteral');
+                        if (types.length != 1)
+                            return;
+                        extract(types[0]);
+                    }
                 };
-                extract(getType(ast, (_b = path.parentPath.node.typeAnnotation) === null || _b === void 0 ? void 0 : _b.typeAnnotation, { directory: context.directoryPath }));
+                extract(getType(context.directoryPath, ast, (_b = path.parentPath.node.typeAnnotation) === null || _b === void 0 ? void 0 : _b.typeAnnotation));
                 if (!expression.arguments.length) {
                     expression.arguments.push(t.objectExpression([]));
                 }

package/compiler/plugins/visualStudioCode.js

@@ -35,9 +35,7 @@ export const visualStudioCode = (options) => {
                     description: (_c = getTags(property).find((tag) => !tag.key)) === null || _c === void 0 ? void 0 : _c.value,
                     values: []
                 };
-                const type = print(getType(context.fileAST, (_d = property.typeAnnotation) === null || _d === void 0 ? void 0 : _d['typeAnnotation'], {
-                    directory: context.directoryPath
-                }));
+                const type = print(getType(context.directoryPath, context.fileAST, (_d = property.typeAnnotation) === null || _d === void 0 ? void 0 : _d['typeAnnotation']));
                 const sections = type.split('|');
                 for (const section of sections) {
                     const trimmed = section.trim();

package/compiler/plugins/webTypes.js

@@ -43,9 +43,7 @@ export const webTypes = (options) => {
                     name: paramCase(property.key['name']),
                     value: {
                         // kind: TODO
-                        type: print(getType(context.fileAST, (_a = property.typeAnnotation) === null || _a === void 0 ? void 0 : _a['typeAnnotation'], {
-                            directory: context.directoryPath
-                        }))
+                        type: print(getType(context.directoryPath, context.fileAST, (_a = property.typeAnnotation) === null || _a === void 0 ? void 0 : _a['typeAnnotation']))
                         // required: TODO
                         // default: TODO
                     },

package/compiler/utils/getType.d.ts

@@ -1,2 +1,2 @@
 import { File, Node } from '@babel/types';
-export declare const getType: (file: File, node: Node, options: any) => Node;
+export declare const getType: (directory: string, file: File, node: Node) => Node;

package/compiler/utils/getType.js

@@ -4,12 +4,11 @@ import fs from 'fs-extra';
 import { dirname, resolve } from 'path';
 import { join } from 'path';
 import { visitor } from './visitor.js';
-export const getType = (file, node, options) => {
+export const getType = (directory, file, node) => {
     if (!node)
         return node;
     if (node.type != 'TSTypeReference')
         return node;
-    const { directory } = options;
     let result;
     visitor(file, {
         ClassDeclaration(path) {
@@ -48,9 +47,7 @@ export const getType = (file, node, options) => {
                         plugins: ['typescript'],
                         ranges: false
                     }));
-                    result = getType(path.$ast, node, {
-                        directory: dirname(filePath)
-                    });
+                    result = getType(dirname(filePath), path.$ast, node);
                 }
                 catch (_a) { }
                 path.stop();
@@ -71,7 +68,7 @@ export const getType = (file, node, options) => {
                 case 'TSUnionType':
                     const types = [];
                     for (const prev of result.types) {
-                        const next = getType(file, prev, options);
+                        const next = getType(directory, file, prev);
                         if (next.type == 'TSUnionType') {
                             next.types.forEach((type) => types.push(type));
                         }
@@ -82,7 +79,7 @@ export const getType = (file, node, options) => {
                     result.types = types;
                     break;
                 default:
-                    result = getType(file, result, options);
+                    result = getType(directory, file, result);
                     break;
             }
             path.stop();

package/constants/index.d.ts

@@ -15,6 +15,7 @@ export declare const DECORATOR_PROPERTY = "Property";
 export declare const DECORATOR_STATE = "State";
 export declare const DECORATOR_METHOD = "Method";
 export declare const LIFECYCLE_ADOPTED = "adoptedCallback";
+export declare const LIFECYCLE_CONNECT = "connectCallback";
 export declare const LIFECYCLE_CONNECTED = "connectedCallback";
 export declare const LIFECYCLE_DISCONNECTED = "disconnectedCallback";
 export declare const LIFECYCLE_LOADED = "loadedCallback";

package/constants/index.js

@@ -19,6 +19,7 @@ export const DECORATOR_STATE = 'State';
 export const DECORATOR_METHOD = 'Method';
 // lifecycle
 export const LIFECYCLE_ADOPTED = 'adoptedCallback';
+export const LIFECYCLE_CONNECT = 'connectCallback';
 export const LIFECYCLE_CONNECTED = 'connectedCallback';
 export const LIFECYCLE_DISCONNECTED = 'disconnectedCallback';
 export const LIFECYCLE_LOADED = 'loadedCallback';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htmlplus/element",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "license": "MIT",
   "sideEffects": false,
   "author": "Masood Abdolian <m.abdolian@gmail.com>",