crankscript 0.5.0 → 0.6.0

package/package.json

@@ -1,27 +1,27 @@
 {
-  "name": "crankscript",
-  "version": "0.5.0",
-  "scripts": {
-    "dev": "tsx src/index.ts",
-    "post-build": "tsc-alias --project tsconfig.json"
-  },
-  "bin": {
-    "crankscript": "./src/index.js"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "@inkjs/ui": "^2.0.0",
-    "@swc/helpers": "~0.5.11",
-    "cheerio": "^1.0.0",
-    "clipanion": "^4.0.0-rc.4",
-    "ink": "^5.0.1",
-    "react": "^18.3.1",
-    "ts-morph": "^23.0.0",
-    "typanion": "^3.14.0"
-  },
-  "type": "module",
-  "main": "./src/index.js",
-  "typings": "./src/index.d.ts",
-  "module": "./src/index.js",
-  "types": "./src/index.d.ts"
+    "name": "crankscript",
+    "version": "0.6.0",
+    "scripts": {
+        "dev": "tsx src/index.ts",
+        "post-build": "tsc-alias --project tsconfig.json"
+    },
+    "bin": {
+        "crankscript": "./src/index.js"
+    },
+    "license": "MIT",
+    "dependencies": {
+        "@inkjs/ui": "^2.0.0",
+        "@swc/helpers": "~0.5.11",
+        "cheerio": "^1.0.0",
+        "clipanion": "^4.0.0-rc.4",
+        "ink": "^5.0.1",
+        "react": "^18.3.1",
+        "ts-morph": "^23.0.0",
+        "typanion": "^3.14.0"
+    },
+    "type": "module",
+    "main": "./src/index.js",
+    "typings": "./src/index.d.ts",
+    "module": "./src/index.js",
+    "types": "./src/index.d.ts"
 }

package/src/commands/DoctorCommand.js

@@ -1,7 +1,7 @@
 import { Command } from 'clipanion';
 import { Text } from 'ink';
 import React from 'react';
-import { createEnvironment } from '@/cli/environment/createEnvironment.js';
+import { createEnvironment } from '../environment/createEnvironment.js';
 import { HealthReport } from './EnvironmentAwareCommand/components/HealthReport.js';
 import { RenderableCommand } from './RenderableCommand.js';
 export class DoctorCommand extends RenderableCommand {

package/src/commands/EnvironmentAwareCommand/EnvironmentAwareCommand.d.ts

@@ -1,6 +1,6 @@
 import { JSX } from 'react';
-import { RenderableCommand } from '@/cli/commands/RenderableCommand.js';
-import { Environment } from '@/cli/environment/dto/Environment.js';
+import { RenderableCommand } from '../../commands/RenderableCommand.js';
+import { Environment } from '../../environment/dto/Environment.js';
 export declare abstract class EnvironmentAwareCommand extends RenderableCommand {
     private environment;
     protected abstract renderWithEnvironment(environment: Environment): JSX.Element;

package/src/commands/EnvironmentAwareCommand/EnvironmentAwareCommand.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import { HealthReport } from '@/cli/commands/EnvironmentAwareCommand/components/HealthReport.js';
-import { RenderableCommand } from '@/cli/commands/RenderableCommand.js';
-import { createEnvironment } from '@/cli/environment/createEnvironment.js';
+import { HealthReport } from '../../commands/EnvironmentAwareCommand/components/HealthReport.js';
+import { RenderableCommand } from '../../commands/RenderableCommand.js';
+import { createEnvironment } from '../../environment/createEnvironment.js';
 export class EnvironmentAwareCommand extends RenderableCommand {
     render() {
         if (!this.environment) {

package/src/commands/EnvironmentAwareCommand/components/HealthReport.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { EnvironmentHealthResult } from '@/cli/types.js';
+import { EnvironmentHealthResult } from '../../../types.js';
 interface Props {
     environment: EnvironmentHealthResult;
 }

package/src/commands/EnvironmentAwareCommand/components/HealthReport.js

@@ -1,7 +1,7 @@
 import { StatusMessage } from '@inkjs/ui';
 import { Text } from 'ink';
 import React from 'react';
-import { HealthCheckStatusType } from '@/cli/types.js';
+import { HealthCheckStatusType } from '../../../types.js';
 const SuccessMessages = {
     sdkPathKnown: {
         [HealthCheckStatusType.Unknown]: 'SDK path status unknown',

package/src/commands/GenerateTypes/GenerateTypesCommand.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
-import { RenderableCommand } from '@/cli/commands/RenderableCommand.js';
+import { RenderableCommand } from '../../commands/RenderableCommand.js';
 export declare class GenerateTypesCommand extends RenderableCommand {
     static paths: string[][];
     static usage: import("clipanion").Usage;
     output: string;
+    overwriteJson: boolean;
     version: any;
     render(): React.JSX.Element;
 }

package/src/commands/GenerateTypes/GenerateTypesCommand.js

@@ -3,15 +3,16 @@ import * as process from 'node:process';
 import { Command, Option } from 'clipanion';
 import React from 'react';
 import * as t from 'typanion';
-import { RenderableCommand } from '@/cli/commands/RenderableCommand.js';
-import { PlaydateSdkVersionIdentifier } from '@/cli/types.js';
+import { RenderableCommand } from '../../commands/RenderableCommand.js';
+import { PlaydateSdkVersionIdentifier } from '../../types.js';
 import { GenerateTypes } from './components/GenerateTypes.js';
 export class GenerateTypesCommand extends RenderableCommand {
     render() {
         const output = this.output.endsWith('.d.ts') ? this.output : join(this.output, 'playdate.d.ts');
         return /*#__PURE__*/ React.createElement(GenerateTypes, {
             output: output,
-            version: this.version
+            version: this.version,
+            overwriteJson: this.overwriteJson
         });
     }
     constructor(...args){
@@ -20,6 +21,9 @@ export class GenerateTypesCommand extends RenderableCommand {
             description: `Where to generate the playdate.d.ts file. Defaults to the current working directory ("${process.cwd()}")`,
             validator: t.isString()
         });
+        this.overwriteJson = Option.Boolean('-j,--overwrite-json', false, {
+            description: 'Overwrite the JSON data file with the new data'
+        });
         this.version = Option.String({
             name: 'version',
             validator: t.isOneOf([

package/src/commands/GenerateTypes/GenerateTypesCommand.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../libs/cli/src/commands/GenerateTypes/GenerateTypesCommand.tsx"],"sourcesContent":["import { join } from 'node:path';\nimport * as process from 'node:process';\nimport { Command, Option } from 'clipanion';\nimport React from 'react';\nimport * as t from 'typanion';\nimport { AnyStrictValidator } from 'typanion';\nimport { RenderableCommand } from '@/cli/commands/RenderableCommand.js';\nimport { PlaydateSdkVersionIdentifier } from '@/cli/types.js';\nimport { GenerateTypes } from './components/GenerateTypes.js';\n\nexport class GenerateTypesCommand extends RenderableCommand {\n    static override paths = [['generate-types']];\n    static override usage = Command.Usage({\n        description: 'Generate types from the Playdate SDK documentation',\n    });\n\n    output = Option.String('-o,--output', process.cwd(), {\n        description: `Where to generate the playdate.d.ts file. Defaults to the current working directory (\"${process.cwd()}\")`,\n        validator: t.isString(),\n    });\n\n    version = Option.String({\n        name: 'version',\n        validator: t.isOneOf([\n            t.isLiteral(PlaydateSdkVersionIdentifier.Latest),\n            t.matchesRegExp(/^[0-9]+\\.[0-9]+\\.[0-9]+$/) as AnyStrictValidator,\n        ]),\n    });\n\n    override render() {\n        const output = this.output.endsWith('.d.ts')\n            ? this.output\n            : join(this.output, 'playdate.d.ts');\n\n        return <GenerateTypes output={output} version={this.version} />;\n    }\n}\n"],"names":["join","process","Command","Option","React","t","RenderableCommand","PlaydateSdkVersionIdentifier","GenerateTypes","GenerateTypesCommand","render","output","endsWith","version","String","cwd","description","validator","isString","name","isOneOf","isLiteral","Latest","matchesRegExp","paths","usage","Usage"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,SAASA,IAAI,QAAQ,YAAY;AACjC,YAAYC,aAAa,eAAe;AACxC,SAASC,OAAO,EAAEC,MAAM,QAAQ,YAAY;AAC5C,OAAOC,WAAW,QAAQ;AAC1B,YAAYC,OAAO,WAAW;AAE9B,SAASC,iBAAiB,QAAQ,sCAAsC;AACxE,SAASC,4BAA4B,QAAQ,iBAAiB;AAC9D,SAASC,aAAa,QAAQ,gCAAgC;AAE9D,OAAO,MAAMC,6BAA6BH;IAmB7BI,SAAS;QACd,MAAMC,SAAS,IAAI,CAACA,MAAM,CAACC,QAAQ,CAAC,WAC9B,IAAI,CAACD,MAAM,GACXX,KAAK,IAAI,CAACW,MAAM,EAAE;QAExB,qBAAO,oBAACH;YAAcG,QAAQA;YAAQE,SAAS,IAAI,CAACA,OAAO;;IAC/D;;;aAnBAF,SAASR,OAAOW,MAAM,CAAC,eAAeb,QAAQc,GAAG,IAAI;YACjDC,aAAa,CAAC,sFAAsF,EAAEf,QAAQc,GAAG,GAAG,EAAE,CAAC;YACvHE,WAAWZ,EAAEa,QAAQ;QACzB;aAEAL,UAAUV,OAAOW,MAAM,CAAC;YACpBK,MAAM;YACNF,WAAWZ,EAAEe,OAAO,CAAC;gBACjBf,EAAEgB,SAAS,CAACd,6BAA6Be,MAAM;gBAC/CjB,EAAEkB,aAAa,CAAC;aACnB;QACL;;AASJ;AA1Bad,qBACOe,QAAQ;IAAC;QAAC;KAAiB;CAAC;AADnCf,qBAEOgB,QAAQvB,QAAQwB,KAAK,CAAC;IAClCV,aAAa;AACjB"}
+{"version":3,"sources":["../../../../../../libs/cli/src/commands/GenerateTypes/GenerateTypesCommand.tsx"],"sourcesContent":["import { join } from 'node:path';\nimport * as process from 'node:process';\nimport { Command, Option } from 'clipanion';\nimport React from 'react';\nimport * as t from 'typanion';\nimport { AnyStrictValidator } from 'typanion';\nimport { RenderableCommand } from '@/cli/commands/RenderableCommand.js';\nimport { PlaydateSdkVersionIdentifier } from '@/cli/types.js';\nimport { GenerateTypes } from './components/GenerateTypes.js';\n\nexport class GenerateTypesCommand extends RenderableCommand {\n    static override paths = [['generate-types']];\n    static override usage = Command.Usage({\n        description: 'Generate types from the Playdate SDK documentation',\n    });\n\n    output = Option.String('-o,--output', process.cwd(), {\n        description: `Where to generate the playdate.d.ts file. Defaults to the current working directory (\"${process.cwd()}\")`,\n        validator: t.isString(),\n    });\n\n    overwriteJson = Option.Boolean('-j,--overwrite-json', false, {\n        description: 'Overwrite the JSON data file with the new data',\n    });\n\n    version = Option.String({\n        name: 'version',\n        validator: t.isOneOf([\n            t.isLiteral(PlaydateSdkVersionIdentifier.Latest),\n            t.matchesRegExp(/^[0-9]+\\.[0-9]+\\.[0-9]+$/) as AnyStrictValidator,\n        ]),\n    });\n\n    override render() {\n        const output = this.output.endsWith('.d.ts')\n            ? this.output\n            : join(this.output, 'playdate.d.ts');\n\n        return (\n            <GenerateTypes\n                output={output}\n                version={this.version}\n                overwriteJson={this.overwriteJson}\n            />\n        );\n    }\n}\n"],"names":["join","process","Command","Option","React","t","RenderableCommand","PlaydateSdkVersionIdentifier","GenerateTypes","GenerateTypesCommand","render","output","endsWith","version","overwriteJson","String","cwd","description","validator","isString","Boolean","name","isOneOf","isLiteral","Latest","matchesRegExp","paths","usage","Usage"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,SAASA,IAAI,QAAQ,YAAY;AACjC,YAAYC,aAAa,eAAe;AACxC,SAASC,OAAO,EAAEC,MAAM,QAAQ,YAAY;AAC5C,OAAOC,WAAW,QAAQ;AAC1B,YAAYC,OAAO,WAAW;AAE9B,SAASC,iBAAiB,QAAQ,sCAAsC;AACxE,SAASC,4BAA4B,QAAQ,iBAAiB;AAC9D,SAASC,aAAa,QAAQ,gCAAgC;AAE9D,OAAO,MAAMC,6BAA6BH;IAuB7BI,SAAS;QACd,MAAMC,SAAS,IAAI,CAACA,MAAM,CAACC,QAAQ,CAAC,WAC9B,IAAI,CAACD,MAAM,GACXX,KAAK,IAAI,CAACW,MAAM,EAAE;QAExB,qBACI,oBAACH;YACGG,QAAQA;YACRE,SAAS,IAAI,CAACA,OAAO;YACrBC,eAAe,IAAI,CAACA,aAAa;;IAG7C;;;aA7BAH,SAASR,OAAOY,MAAM,CAAC,eAAed,QAAQe,GAAG,IAAI;YACjDC,aAAa,CAAC,sFAAsF,EAAEhB,QAAQe,GAAG,GAAG,EAAE,CAAC;YACvHE,WAAWb,EAAEc,QAAQ;QACzB;aAEAL,gBAAgBX,OAAOiB,OAAO,CAAC,uBAAuB,OAAO;YACzDH,aAAa;QACjB;aAEAJ,UAAUV,OAAOY,MAAM,CAAC;YACpBM,MAAM;YACNH,WAAWb,EAAEiB,OAAO,CAAC;gBACjBjB,EAAEkB,SAAS,CAAChB,6BAA6BiB,MAAM;gBAC/CnB,EAAEoB,aAAa,CAAC;aACnB;QACL;;AAeJ;AApCahB,qBACOiB,QAAQ;IAAC;QAAC;KAAiB;CAAC;AADnCjB,qBAEOkB,QAAQzB,QAAQ0B,KAAK,CAAC;IAClCX,aAAa;AACjB"}

package/src/commands/GenerateTypes/components/GenerateTypes.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
-import { PlaydateSdkVersion } from '@/cli/types.js';
+import { PlaydateSdkVersion } from '../../../types.js';
 interface Props {
     output: string;
     version: PlaydateSdkVersion;
+    overwriteJson: boolean;
 }
-export declare const GenerateTypes: ({ output, version }: Props) => React.JSX.Element;
+export declare const GenerateTypes: ({ output, version, overwriteJson }: Props) => React.JSX.Element;
 export {};

package/src/commands/GenerateTypes/components/GenerateTypes.js

@@ -1,16 +1,16 @@
 import React, { useMemo } from 'react';
-import { useFetchHtml } from '@/cli/commands/GenerateTypes/hooks/useFetchHtml.js';
-import { useGenerateTypeFile } from '@/cli/commands/GenerateTypes/hooks/useGenerateTypeFile.js';
-import { useGetVersion } from '@/cli/commands/GenerateTypes/hooks/useGetVersion.js';
-import { useParseDocumentation } from '@/cli/commands/GenerateTypes/hooks/useParseDocumentation.js';
-import { CheckList } from '@/cli/components/CheckList/index.js';
-import { useQuitOnCtrlC } from '@/cli/hooks/useQuitOnCtrlC.js';
-export const GenerateTypes = ({ output, version })=>{
+import { useFetchHtml } from '../../../commands/GenerateTypes/hooks/useFetchHtml.js';
+import { useGenerateTypeFile } from '../../../commands/GenerateTypes/hooks/useGenerateTypeFile.js';
+import { useGetVersion } from '../../../commands/GenerateTypes/hooks/useGetVersion.js';
+import { useParseDocumentation } from '../../../commands/GenerateTypes/hooks/useParseDocumentation.js';
+import { CheckList } from '../../../components/CheckList/index.js';
+import { useQuitOnCtrlC } from '../../../hooks/useQuitOnCtrlC.js';
+export const GenerateTypes = ({ output, version, overwriteJson })=>{
     useQuitOnCtrlC();
-    const { fetchedVersion, getVersion } = useGetVersion(version);
+    const { typeProvider, fetchedVersion, getVersion } = useGetVersion(version);
     const { html, fetchHtml } = useFetchHtml(fetchedVersion);
     const { definitions, parseDocumentation } = useParseDocumentation(html, version);
-    const { generateTypeFile } = useGenerateTypeFile(output, definitions);
+    const { generateTypeFile } = useGenerateTypeFile(output, definitions, typeProvider);
     const items = useMemo(()=>{
         return [
             getVersion,
@@ -21,11 +21,17 @@ export const GenerateTypes = ({ output, version })=>{
     }, [
         fetchedVersion,
         html,
-        definitions
+        definitions,
+        typeProvider
     ]);
     return /*#__PURE__*/ React.createElement(CheckList, {
         items: items,
-        onFinish: process.exit
+        onFinish: ()=>{
+            if (overwriteJson) {
+                typeProvider == null ? void 0 : typeProvider.save();
+            }
+            process.exit();
+        }
     });
 };
 

package/src/commands/GenerateTypes/components/GenerateTypes.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../libs/cli/src/commands/GenerateTypes/components/GenerateTypes.tsx"],"sourcesContent":["import React, { useMemo } from 'react';\nimport { useFetchHtml } from '@/cli/commands/GenerateTypes/hooks/useFetchHtml.js';\nimport { useGenerateTypeFile } from '@/cli/commands/GenerateTypes/hooks/useGenerateTypeFile.js';\nimport { useGetVersion } from '@/cli/commands/GenerateTypes/hooks/useGetVersion.js';\nimport { useParseDocumentation } from '@/cli/commands/GenerateTypes/hooks/useParseDocumentation.js';\nimport { CheckList } from '@/cli/components/CheckList/index.js';\nimport { useQuitOnCtrlC } from '@/cli/hooks/useQuitOnCtrlC.js';\nimport { CheckListItem, PlaydateSdkVersion } from '@/cli/types.js';\n\ninterface Props {\n    output: string;\n    version: PlaydateSdkVersion;\n}\n\nexport const GenerateTypes = ({ output, version }: Props) => {\n    useQuitOnCtrlC();\n\n    const { fetchedVersion, getVersion } = useGetVersion(version);\n    const { html, fetchHtml } = useFetchHtml(fetchedVersion);\n    const { definitions, parseDocumentation } = useParseDocumentation(\n        html,\n        version\n    );\n    const { generateTypeFile } = useGenerateTypeFile(output, definitions);\n\n    const items = useMemo(() => {\n        return [\n            getVersion,\n            fetchHtml,\n            parseDocumentation,\n            generateTypeFile,\n        ] as CheckListItem<unknown>[];\n    }, [fetchedVersion, html, definitions]);\n\n    return <CheckList items={items} onFinish={process.exit} />;\n};\n"],"names":["React","useMemo","useFetchHtml","useGenerateTypeFile","useGetVersion","useParseDocumentation","CheckList","useQuitOnCtrlC","GenerateTypes","output","version","fetchedVersion","getVersion","html","fetchHtml","definitions","parseDocumentation","generateTypeFile","items","onFinish","process","exit"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,SAASC,OAAO,QAAQ,QAAQ;AACvC,SAASC,YAAY,QAAQ,qDAAqD;AAClF,SAASC,mBAAmB,QAAQ,4DAA4D;AAChG,SAASC,aAAa,QAAQ,sDAAsD;AACpF,SAASC,qBAAqB,QAAQ,8DAA8D;AACpG,SAASC,SAAS,QAAQ,sCAAsC;AAChE,SAASC,cAAc,QAAQ,gCAAgC;AAQ/D,OAAO,MAAMC,gBAAgB,CAAC,EAAEC,MAAM,EAAEC,OAAO,EAAS;IACpDH;IAEA,MAAM,EAAEI,cAAc,EAAEC,UAAU,EAAE,GAAGR,cAAcM;IACrD,MAAM,EAAEG,IAAI,EAAEC,SAAS,EAAE,GAAGZ,aAAaS;IACzC,MAAM,EAAEI,WAAW,EAAEC,kBAAkB,EAAE,GAAGX,sBACxCQ,MACAH;IAEJ,MAAM,EAAEO,gBAAgB,EAAE,GAAGd,oBAAoBM,QAAQM;IAEzD,MAAMG,QAAQjB,QAAQ;QAClB,OAAO;YACHW;YACAE;YACAE;YACAC;SACH;IACL,GAAG;QAACN;QAAgBE;QAAME;KAAY;IAEtC,qBAAO,oBAACT;QAAUY,OAAOA;QAAOC,UAAUC,QAAQC,IAAI;;AAC1D,EAAE"}
+{"version":3,"sources":["../../../../../../../libs/cli/src/commands/GenerateTypes/components/GenerateTypes.tsx"],"sourcesContent":["import React, { useMemo } from 'react';\nimport { useFetchHtml } from '@/cli/commands/GenerateTypes/hooks/useFetchHtml.js';\nimport { useGenerateTypeFile } from '@/cli/commands/GenerateTypes/hooks/useGenerateTypeFile.js';\nimport { useGetVersion } from '@/cli/commands/GenerateTypes/hooks/useGetVersion.js';\nimport { useParseDocumentation } from '@/cli/commands/GenerateTypes/hooks/useParseDocumentation.js';\nimport { CheckList } from '@/cli/components/CheckList/index.js';\nimport { useQuitOnCtrlC } from '@/cli/hooks/useQuitOnCtrlC.js';\nimport { CheckListItem, PlaydateSdkVersion } from '@/cli/types.js';\n\ninterface Props {\n    output: string;\n    version: PlaydateSdkVersion;\n    overwriteJson: boolean;\n}\n\nexport const GenerateTypes = ({ output, version, overwriteJson }: Props) => {\n    useQuitOnCtrlC();\n\n    const { typeProvider, fetchedVersion, getVersion } = useGetVersion(version);\n    const { html, fetchHtml } = useFetchHtml(fetchedVersion);\n    const { definitions, parseDocumentation } = useParseDocumentation(\n        html,\n        version\n    );\n    const { generateTypeFile } = useGenerateTypeFile(\n        output,\n        definitions,\n        typeProvider\n    );\n\n    const items = useMemo(() => {\n        return [\n            getVersion,\n            fetchHtml,\n            parseDocumentation,\n            generateTypeFile,\n        ] as CheckListItem<unknown>[];\n    }, [fetchedVersion, html, definitions, typeProvider]);\n\n    return (\n        <CheckList\n            items={items}\n            onFinish={() => {\n                if (overwriteJson) {\n                    typeProvider?.save();\n                }\n\n                process.exit();\n            }}\n        />\n    );\n};\n"],"names":["React","useMemo","useFetchHtml","useGenerateTypeFile","useGetVersion","useParseDocumentation","CheckList","useQuitOnCtrlC","GenerateTypes","output","version","overwriteJson","typeProvider","fetchedVersion","getVersion","html","fetchHtml","definitions","parseDocumentation","generateTypeFile","items","onFinish","save","process","exit"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,SAASC,OAAO,QAAQ,QAAQ;AACvC,SAASC,YAAY,QAAQ,qDAAqD;AAClF,SAASC,mBAAmB,QAAQ,4DAA4D;AAChG,SAASC,aAAa,QAAQ,sDAAsD;AACpF,SAASC,qBAAqB,QAAQ,8DAA8D;AACpG,SAASC,SAAS,QAAQ,sCAAsC;AAChE,SAASC,cAAc,QAAQ,gCAAgC;AAS/D,OAAO,MAAMC,gBAAgB,CAAC,EAAEC,MAAM,EAAEC,OAAO,EAAEC,aAAa,EAAS;IACnEJ;IAEA,MAAM,EAAEK,YAAY,EAAEC,cAAc,EAAEC,UAAU,EAAE,GAAGV,cAAcM;IACnE,MAAM,EAAEK,IAAI,EAAEC,SAAS,EAAE,GAAGd,aAAaW;IACzC,MAAM,EAAEI,WAAW,EAAEC,kBAAkB,EAAE,GAAGb,sBACxCU,MACAL;IAEJ,MAAM,EAAES,gBAAgB,EAAE,GAAGhB,oBACzBM,QACAQ,aACAL;IAGJ,MAAMQ,QAAQnB,QAAQ;QAClB,OAAO;YACHa;YACAE;YACAE;YACAC;SACH;IACL,GAAG;QAACN;QAAgBE;QAAME;QAAaL;KAAa;IAEpD,qBACI,oBAACN;QACGc,OAAOA;QACPC,UAAU;YACN,IAAIV,eAAe;gBACfC,gCAAAA,aAAcU,IAAI;YACtB;YAEAC,QAAQC,IAAI;QAChB;;AAGZ,EAAE"}

package/src/commands/GenerateTypes/fn/generateFunction.d.ts

@@ -0,0 +1,4 @@
+import { ModuleDeclaration, SourceFile } from 'ts-morph';
+import { createTypeProvider } from '../../../commands/GenerateTypes/utils/createTypeProvider.js';
+import { FunctionDescription } from '../../../types.js';
+export declare const generateFunction: (func: FunctionDescription, subject: SourceFile | ModuleDeclaration, typeProvider: ReturnType<typeof createTypeProvider>) => void;

package/src/commands/GenerateTypes/fn/generateFunction.js

@@ -0,0 +1,28 @@
+import { _ as _extends } from "@swc/helpers/_/_extends";
+import { TypescriptReservedNamed } from '../../../constants.js';
+export const generateFunction = (func, subject, typeProvider)=>{
+    const isReserved = TypescriptReservedNamed.includes(func.name);
+    const name = isReserved ? `_${func.name}` : func.name;
+    var _typeProvider_getFunctionOverrideOptions;
+    subject.addFunction(_extends({
+        name,
+        docs: [
+            func.docs
+        ],
+        isExported: !isReserved,
+        returnType: typeProvider.getFunctionReturnType(func),
+        parameters: typeProvider.getParameters(func)
+    }, (_typeProvider_getFunctionOverrideOptions = typeProvider.getFunctionOverrideOptions(func)) != null ? _typeProvider_getFunctionOverrideOptions : {}));
+    if (isReserved) {
+        subject.addExportDeclaration({
+            namedExports: [
+                {
+                    name,
+                    alias: func.name
+                }
+            ]
+        });
+    }
+};
+
+//# sourceMappingURL=generateFunction.js.map

package/src/commands/GenerateTypes/fn/generateFunction.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../libs/cli/src/commands/GenerateTypes/fn/generateFunction.ts"],"sourcesContent":["import {\n    FunctionDeclarationStructure,\n    ModuleDeclaration,\n    SourceFile,\n} from 'ts-morph';\nimport { createTypeProvider } from '@/cli/commands/GenerateTypes/utils/createTypeProvider.js';\nimport { TypescriptReservedNamed } from '@/cli/constants.js';\nimport { FunctionDescription } from '@/cli/types.js';\n\nexport const generateFunction = (\n    func: FunctionDescription,\n    subject: SourceFile | ModuleDeclaration,\n    typeProvider: ReturnType<typeof createTypeProvider>\n) => {\n    const isReserved = TypescriptReservedNamed.includes(func.name);\n\n    const name = isReserved ? `_${func.name}` : func.name;\n\n    subject.addFunction({\n        name,\n        docs: [func.docs],\n        isExported: !isReserved,\n        returnType: typeProvider.getFunctionReturnType(func),\n        parameters: typeProvider.getParameters(func),\n        ...((typeProvider.getFunctionOverrideOptions(\n            func\n        ) as Partial<FunctionDeclarationStructure>) ?? {}),\n    });\n\n    if (isReserved) {\n        subject.addExportDeclaration({\n            namedExports: [\n                {\n                    name,\n                    alias: func.name,\n                },\n            ],\n        });\n    }\n};\n"],"names":["TypescriptReservedNamed","generateFunction","func","subject","typeProvider","isReserved","includes","name","addFunction","docs","isExported","returnType","getFunctionReturnType","parameters","getParameters","getFunctionOverrideOptions","addExportDeclaration","namedExports","alias"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";AAMA,SAASA,uBAAuB,QAAQ,qBAAqB;AAG7D,OAAO,MAAMC,mBAAmB,CAC5BC,MACAC,SACAC;IAEA,MAAMC,aAAaL,wBAAwBM,QAAQ,CAACJ,KAAKK,IAAI;IAE7D,MAAMA,OAAOF,aAAa,CAAC,CAAC,EAAEH,KAAKK,IAAI,CAAC,CAAC,GAAGL,KAAKK,IAAI;QAQ5CH;IANTD,QAAQK,WAAW,CAAC;QAChBD;QACAE,MAAM;YAACP,KAAKO,IAAI;SAAC;QACjBC,YAAY,CAACL;QACbM,YAAYP,aAAaQ,qBAAqB,CAACV;QAC/CW,YAAYT,aAAaU,aAAa,CAACZ;OACnC,CAACE,2CAAAA,aAAaW,0BAA0B,CACxCb,iBADCE,2CAE0C,CAAC;IAGpD,IAAIC,YAAY;QACZF,QAAQa,oBAAoB,CAAC;YACzBC,cAAc;gBACV;oBACIV;oBACAW,OAAOhB,KAAKK,IAAI;gBACpB;aACH;QACL;IACJ;AACJ,EAAE"}

package/src/commands/GenerateTypes/fn/generateNamespace.d.ts

@@ -1,3 +1,4 @@
-import { ModuleDeclaration, SourceFile } from 'ts-morph';
-import { PlaydateNamespace } from '@/cli/types.js';
-export declare const generateNamespace: (subject: SourceFile | ModuleDeclaration, namespace: string, namespaceDescription: PlaydateNamespace, nextNamespaces: string[]) => void;
+import { InterfaceDeclaration, ModuleDeclaration, SourceFile } from 'ts-morph';
+import { createTypeProvider } from '../../../commands/GenerateTypes/utils/createTypeProvider.js';
+import { PlaydateNamespace, PlaydateType } from '../../../types.js';
+export declare const generateNamespace: (namespaceDescription: PlaydateNamespace, namespaces: string[], subjects: Map<string, SourceFile | ModuleDeclaration>, typeSubjects: Map<string, InterfaceDeclaration>, typeProvider: ReturnType<typeof createTypeProvider>, types: Record<string, PlaydateType>) => void;

package/src/commands/GenerateTypes/fn/generateNamespace.js

@@ -1,32 +1,79 @@
-import { TypescriptReservedNamed } from '@/cli/constants.js';
-export const generateNamespace = (subject, namespace, namespaceDescription, nextNamespaces)=>{
+import { _ as _extends } from "@swc/helpers/_/_extends";
+import { VariableDeclarationKind } from 'ts-morph';
+import { generateFunction } from '../../../commands/GenerateTypes/fn/generateFunction.js';
+export const generateNamespace = (namespaceDescription, namespaces, subjects, typeSubjects, typeProvider, types)=>{
+    const subjectName = namespaces.slice(0, -1).join('.');
+    const namespaceName = namespaces[namespaces.length - 1];
+    const isRoot = namespaces.length === 1 && namespaces[0] === 'playdate';
+    const subject = namespaces.length === 1 ? subjects.get('root') : subjects.get(subjectName);
+    if (!subject) {
+        return;
+    }
     const module = subject.addModule({
-        name: namespace.trim()
+        name: namespaceName
     });
-    if (nextNamespaces.length) {
-        generateNamespace(module, nextNamespaces[0], namespaceDescription, nextNamespaces.slice(1));
-    } else {
-        for (const func of namespaceDescription.functions){
-            const isReserved = TypescriptReservedNamed.includes(func.name);
-            const name = isReserved ? `_${func.name}` : func.name;
-            module.addFunction({
-                name,
+    const addMethods = (typeName, subj, methods)=>{
+        const interfaceName = typeName.split('.').map((name)=>name[0].toUpperCase() + name.slice(1)).join('');
+        const typeInterface = subj.addInterface({
+            name: interfaceName
+        });
+        typeSubjects.set(typeName, typeInterface);
+        for (const func of methods){
+            const parameters = typeProvider.getParameters(func);
+            typeInterface.addMethod(_extends({
+                name: func.name,
                 docs: [
                     func.docs
                 ],
-                isExported: !isReserved
-            });
-            if (isReserved) {
-                module.addExportDeclaration({
-                    namedExports: [
-                        {
-                            name,
-                            alias: func.name
-                        }
-                    ]
+                returnType: typeProvider.getFunctionReturnType(func),
+                parameters
+            }, typeProvider.getFunctionOverrideOptions(func)));
+        }
+    };
+    if (isRoot) {
+        module.addJsDoc({
+            description: 'Playdate SDK'
+        });
+        module.addStatements(typeProvider.getStatements());
+        Object.keys(types).forEach((eachType)=>{
+            addMethods(eachType, module, types[eachType].methods);
+        });
+    }
+    subjects.set(namespaces.join('.'), module);
+    if (namespaceDescription.methods.length > 0) {
+        addMethods(namespaces.join('.'), subjects.get('playdate'), namespaceDescription.methods);
+    }
+    for (const property of namespaceDescription.properties){
+        const propertyDetails = typeProvider.getPropertyDetails(property);
+        if (!propertyDetails.isStatic) {
+            const typeName = namespaces.join('.');
+            if (typeSubjects.has(typeName)) {
+                const typeInterface = typeSubjects.get(typeName);
+                typeInterface.addProperty({
+                    name: property.name,
+                    type: propertyDetails.type,
+                    docs: [
+                        property.docs
+                    ],
+                    isReadonly: propertyDetails.isReadOnly
                 });
             }
+            continue;
         }
+        const propertyType = propertyDetails.type;
+        module.addVariableStatement({
+            isExported: true,
+            declarationKind: VariableDeclarationKind.Const,
+            declarations: [
+                {
+                    name: property.name,
+                    type: propertyType
+                }
+            ]
+        });
+    }
+    for (const func of namespaceDescription.functions){
+        generateFunction(func, module, typeProvider);
     }
 };
 

package/src/commands/GenerateTypes/fn/generateNamespace.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../libs/cli/src/commands/GenerateTypes/fn/generateNamespace.ts"],"sourcesContent":["import { ModuleDeclaration, SourceFile } from 'ts-morph';\nimport { TypescriptReservedNamed } from '@/cli/constants.js';\nimport { PlaydateNamespace } from '@/cli/types.js';\n\nexport const generateNamespace = (\n    subject: SourceFile | ModuleDeclaration,\n    namespace: string,\n    namespaceDescription: PlaydateNamespace,\n    nextNamespaces: string[]\n) => {\n    const module = subject.addModule({\n        name: namespace.trim(),\n    });\n\n    if (nextNamespaces.length) {\n        generateNamespace(\n            module,\n            nextNamespaces[0],\n            namespaceDescription,\n            nextNamespaces.slice(1)\n        );\n    } else {\n        for (const func of namespaceDescription.functions) {\n            const isReserved = TypescriptReservedNamed.includes(func.name);\n\n            const name = isReserved ? `_${func.name}` : func.name;\n\n            module.addFunction({\n                name,\n                docs: [func.docs],\n                isExported: !isReserved,\n            });\n\n            if (isReserved) {\n                module.addExportDeclaration({\n                    namedExports: [\n                        {\n                            name,\n                            alias: func.name,\n                        },\n                    ],\n                });\n            }\n        }\n    }\n};\n"],"names":["TypescriptReservedNamed","generateNamespace","subject","namespace","namespaceDescription","nextNamespaces","module","addModule","name","trim","length","slice","func","functions","isReserved","includes","addFunction","docs","isExported","addExportDeclaration","namedExports","alias"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AACA,SAASA,uBAAuB,QAAQ,qBAAqB;AAG7D,OAAO,MAAMC,oBAAoB,CAC7BC,SACAC,WACAC,sBACAC;IAEA,MAAMC,SAASJ,QAAQK,SAAS,CAAC;QAC7BC,MAAML,UAAUM,IAAI;IACxB;IAEA,IAAIJ,eAAeK,MAAM,EAAE;QACvBT,kBACIK,QACAD,cAAc,CAAC,EAAE,EACjBD,sBACAC,eAAeM,KAAK,CAAC;IAE7B,OAAO;QACH,KAAK,MAAMC,QAAQR,qBAAqBS,SAAS,CAAE;YAC/C,MAAMC,aAAad,wBAAwBe,QAAQ,CAACH,KAAKJ,IAAI;YAE7D,MAAMA,OAAOM,aAAa,CAAC,CAAC,EAAEF,KAAKJ,IAAI,CAAC,CAAC,GAAGI,KAAKJ,IAAI;YAErDF,OAAOU,WAAW,CAAC;gBACfR;gBACAS,MAAM;oBAACL,KAAKK,IAAI;iBAAC;gBACjBC,YAAY,CAACJ;YACjB;YAEA,IAAIA,YAAY;gBACZR,OAAOa,oBAAoB,CAAC;oBACxBC,cAAc;wBACV;4BACIZ;4BACAa,OAAOT,KAAKJ,IAAI;wBACpB;qBACH;gBACL;YACJ;QACJ;IACJ;AACJ,EAAE"}
+{"version":3,"sources":["../../../../../../../libs/cli/src/commands/GenerateTypes/fn/generateNamespace.ts"],"sourcesContent":["import {\n    InterfaceDeclaration,\n    MethodSignatureStructure,\n    ModuleDeclaration,\n    SourceFile,\n    VariableDeclarationKind,\n} from 'ts-morph';\nimport { generateFunction } from '@/cli/commands/GenerateTypes/fn/generateFunction.js';\nimport { createTypeProvider } from '@/cli/commands/GenerateTypes/utils/createTypeProvider.js';\nimport {\n    FunctionDescription,\n    PlaydateNamespace,\n    PlaydateType,\n} from '@/cli/types.js';\n\nexport const generateNamespace = (\n    namespaceDescription: PlaydateNamespace,\n    namespaces: string[],\n    subjects: Map<string, SourceFile | ModuleDeclaration>,\n    typeSubjects: Map<string, InterfaceDeclaration>,\n    typeProvider: ReturnType<typeof createTypeProvider>,\n    types: Record<string, PlaydateType>\n) => {\n    const subjectName = namespaces.slice(0, -1).join('.');\n    const namespaceName = namespaces[namespaces.length - 1];\n    const isRoot = namespaces.length === 1 && namespaces[0] === 'playdate';\n    const subject =\n        namespaces.length === 1\n            ? subjects.get('root')\n            : subjects.get(subjectName);\n\n    if (!subject) {\n        return;\n    }\n\n    const module = subject.addModule({\n        name: namespaceName,\n    });\n\n    const addMethods = (\n        typeName: string,\n        subj: ModuleDeclaration,\n        methods: FunctionDescription[]\n    ) => {\n        const interfaceName = typeName\n            .split('.')\n            .map((name) => name[0].toUpperCase() + name.slice(1))\n            .join('');\n        const typeInterface = subj.addInterface({\n            name: interfaceName,\n        });\n        typeSubjects.set(typeName, typeInterface);\n\n        for (const func of methods) {\n            const parameters = typeProvider.getParameters(func);\n\n            typeInterface.addMethod({\n                name: func.name,\n                docs: [func.docs],\n                returnType: typeProvider.getFunctionReturnType(func),\n                parameters,\n                ...(typeProvider.getFunctionOverrideOptions(\n                    func\n                ) as Partial<MethodSignatureStructure>),\n            });\n        }\n    };\n\n    if (isRoot) {\n        module.addJsDoc({\n            description: 'Playdate SDK',\n        });\n        module.addStatements(typeProvider.getStatements());\n\n        Object.keys(types).forEach((eachType) => {\n            addMethods(eachType, module, types[eachType].methods);\n        });\n    }\n\n    subjects.set(namespaces.join('.'), module);\n\n    if (namespaceDescription.methods.length > 0) {\n        addMethods(\n            namespaces.join('.'),\n            subjects.get('playdate') as ModuleDeclaration,\n            namespaceDescription.methods\n        );\n    }\n\n    for (const property of namespaceDescription.properties) {\n        const propertyDetails = typeProvider.getPropertyDetails(property);\n        if (!propertyDetails.isStatic) {\n            const typeName = namespaces.join('.');\n\n            if (typeSubjects.has(typeName)) {\n                const typeInterface = typeSubjects.get(\n                    typeName\n                ) as InterfaceDeclaration;\n\n                typeInterface.addProperty({\n                    name: property.name,\n                    type: propertyDetails.type,\n                    docs: [property.docs],\n                    isReadonly: propertyDetails.isReadOnly,\n                });\n            }\n\n            continue;\n        }\n\n        const propertyType = propertyDetails.type;\n\n        module.addVariableStatement({\n            isExported: true,\n            declarationKind: VariableDeclarationKind.Const,\n            declarations: [\n                {\n                    name: property.name,\n                    type: propertyType,\n                },\n            ],\n        });\n    }\n\n    for (const func of namespaceDescription.functions) {\n        generateFunction(func, module, typeProvider);\n    }\n};\n"],"names":["VariableDeclarationKind","generateFunction","generateNamespace","namespaceDescription","namespaces","subjects","typeSubjects","typeProvider","types","subjectName","slice","join","namespaceName","length","isRoot","subject","get","module","addModule","name","addMethods","typeName","subj","methods","interfaceName","split","map","toUpperCase","typeInterface","addInterface","set","func","parameters","getParameters","addMethod","docs","returnType","getFunctionReturnType","getFunctionOverrideOptions","addJsDoc","description","addStatements","getStatements","Object","keys","forEach","eachType","property","properties","propertyDetails","getPropertyDetails","isStatic","has","addProperty","type","isReadonly","isReadOnly","propertyType","addVariableStatement","isExported","declarationKind","Const","declarations","functions"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";AAAA,SAKIA,uBAAuB,QACpB,WAAW;AAClB,SAASC,gBAAgB,QAAQ,sDAAsD;AAQvF,OAAO,MAAMC,oBAAoB,CAC7BC,sBACAC,YACAC,UACAC,cACAC,cACAC;IAEA,MAAMC,cAAcL,WAAWM,KAAK,CAAC,GAAG,CAAC,GAAGC,IAAI,CAAC;IACjD,MAAMC,gBAAgBR,UAAU,CAACA,WAAWS,MAAM,GAAG,EAAE;IACvD,MAAMC,SAASV,WAAWS,MAAM,KAAK,KAAKT,UAAU,CAAC,EAAE,KAAK;IAC5D,MAAMW,UACFX,WAAWS,MAAM,KAAK,IAChBR,SAASW,GAAG,CAAC,UACbX,SAASW,GAAG,CAACP;IAEvB,IAAI,CAACM,SAAS;QACV;IACJ;IAEA,MAAME,SAASF,QAAQG,SAAS,CAAC;QAC7BC,MAAMP;IACV;IAEA,MAAMQ,aAAa,CACfC,UACAC,MACAC;QAEA,MAAMC,gBAAgBH,SACjBI,KAAK,CAAC,KACNC,GAAG,CAAC,CAACP,OAASA,IAAI,CAAC,EAAE,CAACQ,WAAW,KAAKR,KAAKT,KAAK,CAAC,IACjDC,IAAI,CAAC;QACV,MAAMiB,gBAAgBN,KAAKO,YAAY,CAAC;YACpCV,MAAMK;QACV;QACAlB,aAAawB,GAAG,CAACT,UAAUO;QAE3B,KAAK,MAAMG,QAAQR,QAAS;YACxB,MAAMS,aAAazB,aAAa0B,aAAa,CAACF;YAE9CH,cAAcM,SAAS,CAAC;gBACpBf,MAAMY,KAAKZ,IAAI;gBACfgB,MAAM;oBAACJ,KAAKI,IAAI;iBAAC;gBACjBC,YAAY7B,aAAa8B,qBAAqB,CAACN;gBAC/CC;eACIzB,aAAa+B,0BAA0B,CACvCP;QAGZ;IACJ;IAEA,IAAIjB,QAAQ;QACRG,OAAOsB,QAAQ,CAAC;YACZC,aAAa;QACjB;QACAvB,OAAOwB,aAAa,CAAClC,aAAamC,aAAa;QAE/CC,OAAOC,IAAI,CAACpC,OAAOqC,OAAO,CAAC,CAACC;YACxB1B,WAAW0B,UAAU7B,QAAQT,KAAK,CAACsC,SAAS,CAACvB,OAAO;QACxD;IACJ;IAEAlB,SAASyB,GAAG,CAAC1B,WAAWO,IAAI,CAAC,MAAMM;IAEnC,IAAId,qBAAqBoB,OAAO,CAACV,MAAM,GAAG,GAAG;QACzCO,WACIhB,WAAWO,IAAI,CAAC,MAChBN,SAASW,GAAG,CAAC,aACbb,qBAAqBoB,OAAO;IAEpC;IAEA,KAAK,MAAMwB,YAAY5C,qBAAqB6C,UAAU,CAAE;QACpD,MAAMC,kBAAkB1C,aAAa2C,kBAAkB,CAACH;QACxD,IAAI,CAACE,gBAAgBE,QAAQ,EAAE;YAC3B,MAAM9B,WAAWjB,WAAWO,IAAI,CAAC;YAEjC,IAAIL,aAAa8C,GAAG,CAAC/B,WAAW;gBAC5B,MAAMO,gBAAgBtB,aAAaU,GAAG,CAClCK;gBAGJO,cAAcyB,WAAW,CAAC;oBACtBlC,MAAM4B,SAAS5B,IAAI;oBACnBmC,MAAML,gBAAgBK,IAAI;oBAC1BnB,MAAM;wBAACY,SAASZ,IAAI;qBAAC;oBACrBoB,YAAYN,gBAAgBO,UAAU;gBAC1C;YACJ;YAEA;QACJ;QAEA,MAAMC,eAAeR,gBAAgBK,IAAI;QAEzCrC,OAAOyC,oBAAoB,CAAC;YACxBC,YAAY;YACZC,iBAAiB5D,wBAAwB6D,KAAK;YAC9CC,cAAc;gBACV;oBACI3C,MAAM4B,SAAS5B,IAAI;oBACnBmC,MAAMG;gBACV;aACH;QACL;IACJ;IAEA,KAAK,MAAM1B,QAAQ5B,qBAAqB4D,SAAS,CAAE;QAC/C9D,iBAAiB8B,MAAMd,QAAQV;IACnC;AACJ,EAAE"}

package/src/commands/GenerateTypes/fn/getApiDefinitions.d.ts

@@ -1,14 +1,5 @@
-import { FunctionDescription, PlaydateNamespace, PlaydateType } from '@/cli/types.js';
-export declare const getApiDefinitions: (functions: FunctionDescription[]) => {
+import { FunctionDescription, PlaydateNamespace, PlaydateType, PropertyDescription } from '../../../types.js';
+export declare const getApiDefinitions: (functions: FunctionDescription[], properties: PropertyDescription[]) => {
     namespaces: Record<string, PlaydateNamespace>;
     types: Record<string, PlaydateType>;
-    constants: {
-        name: string;
-        values: {
-            name: string;
-            value: number;
-            docs: string;
-        }[];
-        docs: string;
-    }[];
 };

package/src/commands/GenerateTypes/fn/getApiDefinitions.js

@@ -1,5 +1,4 @@
-import { playdateConstants } from '@/cli/commands/GenerateTypes/utils/playdateConstants.js';
-export const getApiDefinitions = (functions)=>{
+export const getApiDefinitions = (functions, properties)=>{
     const namespaces = {};
     const types = {};
     const realNamespaces = new Set();
@@ -9,17 +8,29 @@ export const getApiDefinitions = (functions)=>{
             let currentNamespace = '';
             func.namespaces.forEach((ns)=>{
                 currentNamespace = currentNamespace ? `${currentNamespace}.${ns}` : ns;
-                // Add to realNamespaces because there's a non-method function here
-                realNamespaces.add(currentNamespace);
+                const realNamespaceName = currentNamespace.trim();
+                if (!realNamespaces.has(realNamespaceName)) {
+                    realNamespaces.add(realNamespaceName);
+                }
             });
         }
     });
+    properties.forEach((prop)=>{
+        let currentNamespace = '';
+        prop.namespaces.forEach((ns)=>{
+            currentNamespace = currentNamespace ? `${currentNamespace}.${ns}` : ns;
+            const realNamespaceName = currentNamespace.trim();
+            if (!realNamespaces.has(realNamespaceName)) {
+                realNamespaces.add(realNamespaceName);
+            }
+        });
+    });
     functions.forEach((func)=>{
         if (func.hasSelf) {
             let currentNamespace = '';
             func.namespaces.forEach((ns)=>{
                 currentNamespace = currentNamespace ? `${currentNamespace}.${ns}` : ns;
-                if (!realNamespaces.has(currentNamespace)) {
+                if (!potentialNamespaces.has(currentNamespace)) {
                     potentialNamespaces.add(currentNamespace);
                 }
             });
@@ -28,14 +39,15 @@ export const getApiDefinitions = (functions)=>{
     realNamespaces.forEach((ns)=>{
         namespaces[ns] = {
             functions: [],
-            callbacks: []
+            methods: [],
+            properties: []
         };
     });
     functions.forEach((func)=>{
         const fullNamespacePath = func.namespaces.join('.');
         if (realNamespaces.has(fullNamespacePath)) {
             if (func.hasSelf) {
-                namespaces[fullNamespacePath].callbacks.push(func);
+                namespaces[fullNamespacePath].methods.push(func);
             } else {
                 namespaces[fullNamespacePath].functions.push(func);
             }
@@ -48,10 +60,15 @@ export const getApiDefinitions = (functions)=>{
             types[fullNamespacePath].methods.push(func);
         }
     });
+    properties.forEach((prop)=>{
+        const fullNamespacePath = prop.namespaces.join('.');
+        if (realNamespaces.has(fullNamespacePath)) {
+            namespaces[fullNamespacePath].properties.push(prop);
+        }
+    });
     return {
         namespaces,
-        types,
-        constants: playdateConstants
+        types
     };
 };
 

package/src/commands/GenerateTypes/fn/getApiDefinitions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../libs/cli/src/commands/GenerateTypes/fn/getApiDefinitions.ts"],"sourcesContent":["import { playdateConstants } from '@/cli/commands/GenerateTypes/utils/playdateConstants.js';\nimport {\n    ApiDefinitions,\n    FunctionDescription,\n    PlaydateNamespace,\n    PlaydateType,\n} from '@/cli/types.js';\n\nexport const getApiDefinitions = (functions: FunctionDescription[]) => {\n    const namespaces: Record<string, PlaydateNamespace> = {};\n    const types: Record<string, PlaydateType> = {};\n    const realNamespaces = new Set<string>();\n    const potentialNamespaces: Set<string> = new Set();\n\n    functions.forEach((func) => {\n        if (!func.hasSelf) {\n            let currentNamespace = '';\n            func.namespaces.forEach((ns) => {\n                currentNamespace = currentNamespace\n                    ? `${currentNamespace}.${ns}`\n                    : ns;\n\n                // Add to realNamespaces because there's a non-method function here\n                realNamespaces.add(currentNamespace);\n            });\n        }\n    });\n\n    functions.forEach((func) => {\n        if (func.hasSelf) {\n            let currentNamespace = '';\n            func.namespaces.forEach((ns) => {\n                currentNamespace = currentNamespace\n                    ? `${currentNamespace}.${ns}`\n                    : ns;\n\n                if (!realNamespaces.has(currentNamespace)) {\n                    potentialNamespaces.add(currentNamespace);\n                }\n            });\n        }\n    });\n\n    realNamespaces.forEach((ns) => {\n        namespaces[ns] = {\n            functions: [],\n            callbacks: [],\n        };\n    });\n\n    functions.forEach((func) => {\n        const fullNamespacePath = func.namespaces.join('.');\n\n        if (realNamespaces.has(fullNamespacePath)) {\n            if (func.hasSelf) {\n                namespaces[fullNamespacePath].callbacks.push(func);\n            } else {\n                namespaces[fullNamespacePath].functions.push(func);\n            }\n        } else if (potentialNamespaces.has(fullNamespacePath)) {\n            if (!types[fullNamespacePath]) {\n                types[fullNamespacePath] = { methods: [] };\n            }\n            types[fullNamespacePath].methods.push(func);\n        }\n    });\n\n    return {\n        namespaces,\n        types,\n        constants: playdateConstants,\n    } satisfies ApiDefinitions;\n};\n"],"names":["playdateConstants","getApiDefinitions","functions","namespaces","types","realNamespaces","Set","potentialNamespaces","forEach","func","hasSelf","currentNamespace","ns","add","has","callbacks","fullNamespacePath","join","push","methods","constants"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,SAASA,iBAAiB,QAAQ,0DAA0D;AAQ5F,OAAO,MAAMC,oBAAoB,CAACC;IAC9B,MAAMC,aAAgD,CAAC;IACvD,MAAMC,QAAsC,CAAC;IAC7C,MAAMC,iBAAiB,IAAIC;IAC3B,MAAMC,sBAAmC,IAAID;IAE7CJ,UAAUM,OAAO,CAAC,CAACC;QACf,IAAI,CAACA,KAAKC,OAAO,EAAE;YACf,IAAIC,mBAAmB;YACvBF,KAAKN,UAAU,CAACK,OAAO,CAAC,CAACI;gBACrBD,mBAAmBA,mBACb,CAAC,EAAEA,iBAAiB,CAAC,EAAEC,GAAG,CAAC,GAC3BA;gBAEN,mEAAmE;gBACnEP,eAAeQ,GAAG,CAACF;YACvB;QACJ;IACJ;IAEAT,UAAUM,OAAO,CAAC,CAACC;QACf,IAAIA,KAAKC,OAAO,EAAE;YACd,IAAIC,mBAAmB;YACvBF,KAAKN,UAAU,CAACK,OAAO,CAAC,CAACI;gBACrBD,mBAAmBA,mBACb,CAAC,EAAEA,iBAAiB,CAAC,EAAEC,GAAG,CAAC,GAC3BA;gBAEN,IAAI,CAACP,eAAeS,GAAG,CAACH,mBAAmB;oBACvCJ,oBAAoBM,GAAG,CAACF;gBAC5B;YACJ;QACJ;IACJ;IAEAN,eAAeG,OAAO,CAAC,CAACI;QACpBT,UAAU,CAACS,GAAG,GAAG;YACbV,WAAW,EAAE;YACba,WAAW,EAAE;QACjB;IACJ;IAEAb,UAAUM,OAAO,CAAC,CAACC;QACf,MAAMO,oBAAoBP,KAAKN,UAAU,CAACc,IAAI,CAAC;QAE/C,IAAIZ,eAAeS,GAAG,CAACE,oBAAoB;YACvC,IAAIP,KAAKC,OAAO,EAAE;gBACdP,UAAU,CAACa,kBAAkB,CAACD,SAAS,CAACG,IAAI,CAACT;YACjD,OAAO;gBACHN,UAAU,CAACa,kBAAkB,CAACd,SAAS,CAACgB,IAAI,CAACT;YACjD;QACJ,OAAO,IAAIF,oBAAoBO,GAAG,CAACE,oBAAoB;YACnD,IAAI,CAACZ,KAAK,CAACY,kBAAkB,EAAE;gBAC3BZ,KAAK,CAACY,kBAAkB,GAAG;oBAAEG,SAAS,EAAE;gBAAC;YAC7C;YACAf,KAAK,CAACY,kBAAkB,CAACG,OAAO,CAACD,IAAI,CAACT;QAC1C;IACJ;IAEA,OAAO;QACHN;QACAC;QACAgB,WAAWpB;IACf;AACJ,EAAE"}
+{"version":3,"sources":["../../../../../../../libs/cli/src/commands/GenerateTypes/fn/getApiDefinitions.ts"],"sourcesContent":["import {\n    ApiDefinitions,\n    FunctionDescription,\n    PlaydateNamespace,\n    PlaydateType,\n    PropertyDescription,\n} from '@/cli/types.js';\n\nexport const getApiDefinitions = (\n    functions: FunctionDescription[],\n    properties: PropertyDescription[]\n) => {\n    const namespaces: Record<string, PlaydateNamespace> = {};\n    const types: Record<string, PlaydateType> = {};\n    const realNamespaces = new Set<string>();\n    const potentialNamespaces = new Set<string>();\n\n    functions.forEach((func) => {\n        if (!func.hasSelf) {\n            let currentNamespace = '';\n            func.namespaces.forEach((ns) => {\n                currentNamespace = currentNamespace\n                    ? `${currentNamespace}.${ns}`\n                    : ns;\n\n                const realNamespaceName = currentNamespace.trim();\n\n                if (!realNamespaces.has(realNamespaceName)) {\n                    realNamespaces.add(realNamespaceName);\n                }\n            });\n        }\n    });\n\n    properties.forEach((prop) => {\n        let currentNamespace = '';\n        prop.namespaces.forEach((ns) => {\n            currentNamespace = currentNamespace\n                ? `${currentNamespace}.${ns}`\n                : ns;\n\n            const realNamespaceName = currentNamespace.trim();\n\n            if (!realNamespaces.has(realNamespaceName)) {\n                realNamespaces.add(realNamespaceName);\n            }\n        });\n    });\n\n    functions.forEach((func) => {\n        if (func.hasSelf) {\n            let currentNamespace = '';\n            func.namespaces.forEach((ns) => {\n                currentNamespace = currentNamespace\n                    ? `${currentNamespace}.${ns}`\n                    : ns;\n\n                if (!potentialNamespaces.has(currentNamespace)) {\n                    potentialNamespaces.add(currentNamespace);\n                }\n            });\n        }\n    });\n\n    realNamespaces.forEach((ns) => {\n        namespaces[ns] = {\n            functions: [],\n            methods: [],\n            properties: [],\n        };\n    });\n\n    functions.forEach((func) => {\n        const fullNamespacePath = func.namespaces.join('.');\n\n        if (realNamespaces.has(fullNamespacePath)) {\n            if (func.hasSelf) {\n                namespaces[fullNamespacePath].methods.push(func);\n            } else {\n                namespaces[fullNamespacePath].functions.push(func);\n            }\n        } else if (potentialNamespaces.has(fullNamespacePath)) {\n            if (!types[fullNamespacePath]) {\n                types[fullNamespacePath] = { methods: [] };\n            }\n            types[fullNamespacePath].methods.push(func);\n        }\n    });\n\n    properties.forEach((prop) => {\n        const fullNamespacePath = prop.namespaces.join('.');\n\n        if (realNamespaces.has(fullNamespacePath)) {\n            namespaces[fullNamespacePath].properties.push(prop);\n        }\n    });\n\n    return {\n        namespaces,\n        types,\n    } satisfies ApiDefinitions;\n};\n"],"names":["getApiDefinitions","functions","properties","namespaces","types","realNamespaces","Set","potentialNamespaces","forEach","func","hasSelf","currentNamespace","ns","realNamespaceName","trim","has","add","prop","methods","fullNamespacePath","join","push"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAQA,OAAO,MAAMA,oBAAoB,CAC7BC,WACAC;IAEA,MAAMC,aAAgD,CAAC;IACvD,MAAMC,QAAsC,CAAC;IAC7C,MAAMC,iBAAiB,IAAIC;IAC3B,MAAMC,sBAAsB,IAAID;IAEhCL,UAAUO,OAAO,CAAC,CAACC;QACf,IAAI,CAACA,KAAKC,OAAO,EAAE;YACf,IAAIC,mBAAmB;YACvBF,KAAKN,UAAU,CAACK,OAAO,CAAC,CAACI;gBACrBD,mBAAmBA,mBACb,CAAC,EAAEA,iBAAiB,CAAC,EAAEC,GAAG,CAAC,GAC3BA;gBAEN,MAAMC,oBAAoBF,iBAAiBG,IAAI;gBAE/C,IAAI,CAACT,eAAeU,GAAG,CAACF,oBAAoB;oBACxCR,eAAeW,GAAG,CAACH;gBACvB;YACJ;QACJ;IACJ;IAEAX,WAAWM,OAAO,CAAC,CAACS;QAChB,IAAIN,mBAAmB;QACvBM,KAAKd,UAAU,CAACK,OAAO,CAAC,CAACI;YACrBD,mBAAmBA,mBACb,CAAC,EAAEA,iBAAiB,CAAC,EAAEC,GAAG,CAAC,GAC3BA;YAEN,MAAMC,oBAAoBF,iBAAiBG,IAAI;YAE/C,IAAI,CAACT,eAAeU,GAAG,CAACF,oBAAoB;gBACxCR,eAAeW,GAAG,CAACH;YACvB;QACJ;IACJ;IAEAZ,UAAUO,OAAO,CAAC,CAACC;QACf,IAAIA,KAAKC,OAAO,EAAE;YACd,IAAIC,mBAAmB;YACvBF,KAAKN,UAAU,CAACK,OAAO,CAAC,CAACI;gBACrBD,mBAAmBA,mBACb,CAAC,EAAEA,iBAAiB,CAAC,EAAEC,GAAG,CAAC,GAC3BA;gBAEN,IAAI,CAACL,oBAAoBQ,GAAG,CAACJ,mBAAmB;oBAC5CJ,oBAAoBS,GAAG,CAACL;gBAC5B;YACJ;QACJ;IACJ;IAEAN,eAAeG,OAAO,CAAC,CAACI;QACpBT,UAAU,CAACS,GAAG,GAAG;YACbX,WAAW,EAAE;YACbiB,SAAS,EAAE;YACXhB,YAAY,EAAE;QAClB;IACJ;IAEAD,UAAUO,OAAO,CAAC,CAACC;QACf,MAAMU,oBAAoBV,KAAKN,UAAU,CAACiB,IAAI,CAAC;QAE/C,IAAIf,eAAeU,GAAG,CAACI,oBAAoB;YACvC,IAAIV,KAAKC,OAAO,EAAE;gBACdP,UAAU,CAACgB,kBAAkB,CAACD,OAAO,CAACG,IAAI,CAACZ;YAC/C,OAAO;gBACHN,UAAU,CAACgB,kBAAkB,CAAClB,SAAS,CAACoB,IAAI,CAACZ;YACjD;QACJ,OAAO,IAAIF,oBAAoBQ,GAAG,CAACI,oBAAoB;YACnD,IAAI,CAACf,KAAK,CAACe,kBAAkB,EAAE;gBAC3Bf,KAAK,CAACe,kBAAkB,GAAG;oBAAED,SAAS,EAAE;gBAAC;YAC7C;YACAd,KAAK,CAACe,kBAAkB,CAACD,OAAO,CAACG,IAAI,CAACZ;QAC1C;IACJ;IAEAP,WAAWM,OAAO,CAAC,CAACS;QAChB,MAAME,oBAAoBF,KAAKd,UAAU,CAACiB,IAAI,CAAC;QAE/C,IAAIf,eAAeU,GAAG,CAACI,oBAAoB;YACvChB,UAAU,CAACgB,kBAAkB,CAACjB,UAAU,CAACmB,IAAI,CAACJ;QAClD;IACJ;IAEA,OAAO;QACHd;QACAC;IACJ;AACJ,EAAE"}

package/src/commands/GenerateTypes/fn/getDescriptionsFromHtml.d.ts

@@ -0,0 +1,5 @@
+import { FunctionDescription, PropertyDescription } from '../../../types.js';
+export declare const getDescriptionsFromHtml: (html: string, version: string) => {
+    functions: FunctionDescription[];
+    properties: PropertyDescription[];
+};