type-crafter 0.1.0 → 0.1.1

package/dist/index.js

@@ -5,6 +5,7 @@ import path$1 from 'path';
 import require$$3 from 'fs';
 import require$$4 from 'process';
 import fs$1 from 'fs/promises';
+import { fileURLToPath } from 'url';
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -19264,13 +19265,19 @@ var Runtime = {
     compileTemplates
 };
 
-function resolveFilePath(filePath) {
+function getSourceFileDirectory() {
+    const fileName = fileURLToPath(import.meta.url);
+    return path$1.dirname(fileName);
+}
+function resolveFilePath(filePath, useCurrentDirectory = true) {
     const isAbsolutePath = path$1.isAbsolute(filePath);
-    const normalizedPath = isAbsolutePath ? filePath : path$1.join(process.cwd(), filePath);
+    const normalizedPath = isAbsolutePath
+        ? filePath
+        : path$1.join(useCurrentDirectory ? process.cwd() : getSourceFileDirectory(), filePath);
     return path$1.resolve(normalizedPath);
 }
-async function readFile(filePath) {
-    const data = await fs$1.readFile(resolveFilePath(filePath), 'utf-8');
+async function readFile(filePath, useCurrentWorkingDirectory = true) {
+    const data = await fs$1.readFile(resolveFilePath(filePath, useCurrentWorkingDirectory), 'utf-8');
     return data;
 }
 async function createFolderWithBasePath(basePath, folderName) {
@@ -19284,7 +19291,12 @@ async function createFolder(folderPath) {
     await fs$1.mkdir(folderPath, { recursive: true });
 }
 async function deleteFolder(folderPath) {
-    await fs$1.rmdir(folderPath, { recursive: true });
+    try {
+        await fs$1.rm(folderPath, { recursive: true });
+    }
+    catch (e) {
+        console.log("Couldn't delete folder: ", folderPath);
+    }
 }
 async function getCompleteFolderPath(folderName) {
     const isAbsolutePath = path$1.isAbsolute(folderName);
@@ -19455,13 +19467,21 @@ function getReferenceName(reference) {
     const referenceParts = reference.split('/');
     return referenceParts[referenceParts.length - 1];
 }
+function resolveAndGetReferenceName(reference) {
+    resolveReference(reference);
+    return getReferenceName(reference);
+}
 function getLanguageDataType(dataType, format, items) {
     const typeMapper = Runtime.getConfig().language.typeMapper ?? null;
     const mappedType = typeMapper !== null ? typeMapper[dataType] : null;
     const itemsType = 
     // eslint-disable-next-line
-    items !== null && items.type !== null
-        ? getLanguageDataType(items.type, items.format, items.items)
+    items !== null
+        ? items.type !== null
+            ? getLanguageDataType(items.type, items.format, items.items)
+            : items.$ref !== null
+                ? resolveAndGetReferenceName(items.$ref)
+                : null
         : null;
     const fillerPatterns = [];
     if (itemsType !== null) {
@@ -19706,10 +19726,10 @@ async function writeOutput(generationResult) {
 
 async function config(inputFilePath, outputDirectory, typesWriterMode, groupedTypesWriterMode) {
     // PRODUCTION will be replaced with PRODUCTION when package is built.
-    const directoryPrefix = 'PRODUCTION'.includes('DEVELOPMENT') ? 'src/' : 'dist/';
-    const objectSyntax = await readFile(directoryPrefix + 'templates/typescript/object-syntax.hbs');
-    const exporterModuleSyntax = await readFile(directoryPrefix + 'templates/typescript/exporter-module-syntax.hbs');
-    const typesFileSyntax = await readFile(directoryPrefix + 'templates/typescript/types-file-syntax.hbs');
+    const directoryPrefix = 'PRODUCTION'.includes('DEVELOPMENT') ? 'src/' : './';
+    const objectSyntax = await readFile(directoryPrefix + 'templates/typescript/object-syntax.hbs', false);
+    const exporterModuleSyntax = await readFile(directoryPrefix + 'templates/typescript/exporter-module-syntax.hbs', false);
+    const typesFileSyntax = await readFile(directoryPrefix + 'templates/typescript/types-file-syntax.hbs', false);
     const config = {
         input: inputFilePath,
         output: {
@@ -19786,7 +19806,7 @@ async function runner(language, inputFilePath, outputDirectory, _typesWriterMode
     }
 }
 greeting();
-const program = new Command().version('0.1.0');
+const program = new Command().version('0.1.1');
 program
     .command('generate')
     .description('Generate types for your language from a type spec file')

package/dist/utils/file-system.d.ts

@@ -1,5 +1,5 @@
-export declare function resolveFilePath(filePath: string): string;
-export declare function readFile(filePath: string): Promise<string>;
+export declare function resolveFilePath(filePath: string, useCurrentDirectory?: boolean): string;
+export declare function readFile(filePath: string, useCurrentWorkingDirectory?: boolean): Promise<string>;
 export declare function createFolderWithBasePath(basePath: string, folderName: string): Promise<void>;
 export declare function createFolder(folderPath: string): Promise<void>;
 export declare function deleteFolder(folderPath: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "type-crafter",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A tool to generate types from a yaml schema for any language",
   "main": "./dist/index.js",
   "type": "module",