sandstone-cli 1.1.4 → 1.1.5

package/lib/commands/build.d.ts

@@ -1,3 +1,4 @@
+import { ProjectFolders } from '../utils.js';
 type BuildOptions = {
     dry?: boolean;
     verbose?: boolean;
@@ -15,5 +16,5 @@ type BuildOptions = {
     ssh?: any;
     dependencies?: [string, string][];
 };
-export declare function buildCommand(opts: BuildOptions): Promise<void>;
+export declare function buildCommand(opts: BuildOptions, _folders?: ProjectFolders): Promise<void>;
 export {};

package/lib/commands/build.js

@@ -1,12 +1,30 @@
-import { register as tsEval } from 'ts-node';
 import path from 'path';
+import { fork } from 'child_process';
 import { getProjectFolders } from '../utils.js';
-import { buildProject } from '../build/index.js';
-export async function buildCommand(opts) {
-    const folders = getProjectFolders(opts.path);
-    tsEval({
-        transpileOnly: !opts.strictErrors,
-        project: path.join(folders.rootFolder, 'tsconfig.json'),
+export function buildCommand(opts, _folders) {
+    var _a, _b;
+    const folders = (_folders === null || _folders === void 0 ? void 0 : _folders.projectFolder) ? _folders : getProjectFolders(opts.path);
+    console.log('Compiling source...\n');
+    const build = fork(path.join(folders.rootFolder, 'node_modules', 'sandstone-build', 'lib', 'index.js'), process.argv.slice(2), {
+        stdio: 'pipe',
+        env: {
+            NODE_OPTIONS: "--loader ts-node/esm",
+            CLI_OPTIONS: JSON.stringify(opts),
+            PROJECT_FOLDERS: JSON.stringify(folders),
+        }
+    });
+    let esmErrored = false;
+    (_a = build === null || build === void 0 ? void 0 : build.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => process.stdout.write(data));
+    (_b = build === null || build === void 0 ? void 0 : build.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
+        if (esmErrored) {
+            process.stderr.write(data);
+        }
+        else {
+            esmErrored = true;
+        }
+    });
+    return new Promise((resolve) => {
+        var _a;
+        (_a = build === null || build === void 0 ? void 0 : build.stdout) === null || _a === void 0 ? void 0 : _a.on('end', () => resolve());
     });
-    buildProject(opts, folders);
 }

package/lib/commands/dependency.d.ts

@@ -1,5 +1,4 @@
 export declare function installNativeCommand(): Promise<void>;
 export declare function installVanillaCommand(_libraries: string[]): Promise<void>;
-export declare function uninstallNativeCommand(): Promise<void>;
 export declare function uninstallVanillaCommand(_libraries: string[]): Promise<void>;
 export declare function refreshCommand(): Promise<void>;

package/lib/commands/dependency.js

@@ -8,7 +8,7 @@ export async function installNativeCommand() {
 }
 export async function installVanillaCommand(_libraries) {
     let libraries = _libraries.map((lib) => [lib, false]);
-    let count = (libraries === null || libraries === void 0 ? void 0 : libraries.length) || 0;
+    let count = libraries.length || 0;
     let manifest = false;
     try {
         manifest = JSON.parse(await fs.readFile(path.resolve('./resources/smithed.json'), 'utf-8'));
@@ -120,12 +120,9 @@ export async function installVanillaCommand(_libraries) {
     console.log;
     console.log(`${count} libraries added`);
 }
-export async function uninstallNativeCommand() {
-    console.log('unimplemented');
-}
 export async function uninstallVanillaCommand(_libraries) {
     const libraries = _libraries || [];
-    let count = (libraries === null || libraries === void 0 ? void 0 : libraries.length) || 0;
+    let count = libraries.length || 0;
     let manifestPath = path.resolve('./resources/smithed.json');
     let manifest = false;
     let lockFilePath = path.resolve('./resources/cache/lock-smithed.json');

package/lib/commands/index.d.ts

@@ -1,4 +1,4 @@
 export { buildCommand } from './build.js';
 export { createCommand } from './create.js';
-export { installNativeCommand, installVanillaCommand, uninstallNativeCommand, uninstallVanillaCommand, refreshCommand } from './dependency.js';
+export { installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './dependency.js';
 export { watchCommand } from './watch.js';

package/lib/commands/index.js

@@ -1,4 +1,4 @@
 export { buildCommand } from './build.js';
 export { createCommand } from './create.js';
-export { installNativeCommand, installVanillaCommand, uninstallNativeCommand, uninstallVanillaCommand, refreshCommand } from './dependency.js';
+export { installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './dependency.js';
 export { watchCommand } from './watch.js';

package/lib/commands/watch.js

@@ -1,8 +1,7 @@
-import { register as tsEval } from 'ts-node';
 import chokidar from 'chokidar';
 import path from 'path';
-import { buildProject } from '../build/index.js';
 import { getProjectFolders } from '../utils.js';
+import { buildCommand } from './build.js';
 export async function watchCommand(opts) {
     let alreadyBuilding = false;
     let needRebuild = false;
@@ -28,7 +27,7 @@ export async function watchCommand(opts) {
             return;
         }
         alreadyBuilding = true;
-        await buildProject(opts, folders);
+        await buildCommand(opts, folders);
         //client?.write('chat', { message: '/reload' })
         alreadyBuilding = false;
         if (needRebuild) {
@@ -36,14 +35,9 @@ export async function watchCommand(opts) {
             await onFilesChange();
         }
     }
-    // Register ts-node
-    const tsConfigPath = path.join(folders.rootFolder, 'tsconfig.json');
-    tsEval({
-        transpileOnly: !opts.strictErrors,
-        project: tsConfigPath,
-    });
     let timeout = null;
     let files = [];
+    console.log('Watching source for changes. Press Ctrl+C to exit.\n');
     chokidar.watch([
         path.join(folders.absProjectFolder, '/**/*'),
         path.join(folders.sandstoneConfigFolder, 'sandstone.config.ts'),

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "sandstone-cli",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",
   "bin": {
-    "sand": "./bin/run.cjs"
+    "sand": "./lib/index.js"
   },
   "scripts": {
     "test": "echo NO TESTS",
@@ -41,31 +41,22 @@
   },
   "homepage": "https://github.com/sandstone-mc/sandstone-cli#readme",
   "dependencies": {
-    "@types/node": "^20.8.7",
-    "adm-zip": "^0.5.10",
+    "@types/node": "^20.8.8",
     "chalk": "^5.3.0",
     "chalk-template": "^1.1.0",
     "chokidar": "^3.5.3",
     "commander": "^10.0.1",
-    "delete-empty": "^3.0.0",
-    "dotenv-cli": "^7.3.0",
     "figlet": "^1.6.0",
     "fs-extra": "^11.1.1",
     "inquirer": "^9.2.11",
-    "klaw": "^4.1.0",
     "nanoid": "^4.0.2",
     "node-fetch": "^3.3.2",
-    "pretty-error": "^4.0.0",
-    "semver": "^7.5.4",
-    "ts-node": "^10.9.1"
+    "semver": "^7.5.4"
   },
   "devDependencies": {
-    "@types/adm-zip": "^0.5.2",
-    "@types/delete-empty": "^3.0.2",
     "@types/figlet": "^1.5.6",
     "@types/fs-extra": "^11.0.2",
     "@types/inquirer": "^9.0.4",
-    "@types/klaw": "^3.0.4",
     "@types/semver": "^7.5.3",
     "typescript": "^5.2.2"
   }

package/src/commands/build.ts

@@ -1,9 +1,7 @@
 
-import { register as tsEval } from 'ts-node'
 import path from 'path'
-
-import { getProjectFolders } from '../utils.js'
-import { buildProject } from '../build/index.js'
+import { fork } from 'child_process'
+import { ProjectFolders, getProjectFolders } from '../utils.js'
 
 type BuildOptions = {
     // Flags
@@ -28,13 +26,33 @@ type BuildOptions = {
     dependencies?: [string, string][]
 }
 
-export async function buildCommand(opts: BuildOptions) {
-    const folders = getProjectFolders(opts.path)
+export function buildCommand(opts: BuildOptions, _folders?: ProjectFolders) {
+  const folders = _folders?.projectFolder ? _folders : getProjectFolders(opts.path)
+
+  console.log('Compiling source...\n')
+
+  const build = fork(path.join(folders.rootFolder, 'node_modules', 'sandstone-build', 'lib', 'index.js'), process.argv.slice(2), {
+    stdio: 'pipe',
+    env: {
+      NODE_OPTIONS: "--loader ts-node/esm",
+      CLI_OPTIONS: JSON.stringify(opts),
+      PROJECT_FOLDERS: JSON.stringify(folders),
+    }
+  })
+
+  let esmErrored = false
+
+  build?.stdout?.on('data', (data) => process.stdout.write(data))
 
-    tsEval({
-      transpileOnly: !opts.strictErrors,
-      project: path.join(folders.rootFolder, 'tsconfig.json'),
-    })
+  build?.stderr?.on('data', (data) => {
+    if (esmErrored) {
+      process.stderr.write(data)
+    } else {
+      esmErrored = true
+    }
+  })
 
-    buildProject(opts, folders)
+  return new Promise<void>((resolve) => {
+    build?.stdout?.on('end', () => resolve())
+  })
 }

package/src/commands/dependency.ts

@@ -20,7 +20,7 @@ type SmithedPack = { display: { description: string } }
 export async function installVanillaCommand(_libraries: string[]) {
   let libraries: [string, boolean][] = _libraries.map((lib) => [lib, false])
 
-  let count = libraries?.length || 0
+  let count = libraries.length || 0
 
   let manifest: Record<string, string> | false = false
   try {
@@ -152,14 +152,10 @@ export async function installVanillaCommand(_libraries: string[]) {
   console.log(`${count} libraries added`)
 }
 
-export async function uninstallNativeCommand() {
-  console.log('unimplemented')
-}
-
 export async function uninstallVanillaCommand(_libraries: string[]) {
   const libraries = _libraries || []
 
-  let count = libraries?.length || 0
+  let count = libraries.length || 0
 
   let manifestPath = path.resolve('./resources/smithed.json')
 

package/src/commands/index.ts

@@ -1,4 +1,4 @@
 export { buildCommand } from './build.js';
 export { createCommand } from './create.js';
-export { installNativeCommand, installVanillaCommand, uninstallNativeCommand, uninstallVanillaCommand, refreshCommand } from './dependency.js'
+export { installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './dependency.js'
 export { watchCommand } from './watch.js';

package/src/commands/watch.ts

@@ -1,9 +1,8 @@
-import { register as tsEval } from 'ts-node'
 import chokidar from 'chokidar'
 import path from 'path'
 
-import { buildProject } from '../build/index.js'
 import { getProjectFolders } from '../utils.js'
+import { buildCommand } from './build.js'
 
 type WatchOptions = {
     // Flags
@@ -56,7 +55,7 @@ export async function watchCommand(opts: WatchOptions) {
 
         alreadyBuilding = true
 
-        await buildProject(opts, folders)
+        await buildCommand(opts, folders)
         //client?.write('chat', { message: '/reload' })
         alreadyBuilding = false
 
@@ -66,17 +65,11 @@ export async function watchCommand(opts: WatchOptions) {
         }
     }
 
-    // Register ts-node
-    const tsConfigPath = path.join(folders.rootFolder, 'tsconfig.json')
-
-    tsEval({
-        transpileOnly: !opts.strictErrors,
-        project: tsConfigPath,
-    })
-
     let timeout: NodeJS.Timeout | null = null
     let files: string[] = []
 
+    console.log('Watching source for changes. Press Ctrl+C to exit.\n')
+
     chokidar.watch([
         path.join(folders.absProjectFolder, '/**/*'),
         path.join(folders.sandstoneConfigFolder, 'sandstone.config.ts'),

package/src/index.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Argument, Command } from 'commander';
 import figlet from 'figlet';
-import { buildCommand, createCommand, watchCommand, installNativeCommand, installVanillaCommand, uninstallNativeCommand, uninstallVanillaCommand, refreshCommand } from './commands/index.js';
+import { buildCommand, createCommand, watchCommand, installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './commands/index.js';
 
 const commander = new Command()
 

package/bin/.env.sand

@@ -1 +0,0 @@
-NODE_OPTIONS=--loader ts-node/esm

package/bin/run.cjs

@@ -1,25 +0,0 @@
-const { fork } = require('child_process')
-const path = require('path')
-
-console.log(process.argv)
-const foo = fork(path.join(__dirname, '..', 'lib', 'index.js'), process.argv.slice(2), {
-    stdio: 'pipe',
-    env: {
-        NODE_OPTIONS: "--loader ts-node/esm"
-    }
-})
-
-foo.stdout.on('data', (data) => process.stdout.write(data))
-
-foo.stderr.on('data', (data) => process.stderr.write(data))
-
-process.stdin.setRawMode(true)
-
-process.stdin.on('keypress', (str, key) => {
-    // "Raw" mode so we must do our own kill switch
-    if(key.sequence === '\u0003') {
-        process.exit();
-    } else {
-        foo.stdin.write(str)
-    }
-});

package/lib/build/index.d.ts

@@ -1,27 +0,0 @@
-import { ProjectFolders } from '../utils.js';
-type BuildOptions = {
-    dry?: boolean;
-    verbose?: boolean;
-    root?: boolean;
-    fullTrace?: boolean;
-    strictErrors?: boolean;
-    production?: boolean;
-    path: string;
-    configPath: string;
-    name?: string;
-    namespace?: string;
-    world?: string;
-    clientPath?: string;
-    serverPath?: string;
-    ssh?: any;
-    dependencies?: [string, string][];
-};
-/**
- * Build the project. Will log errors and never throw any.
- *
- * @param options The options to build the project with.
- *
- * @param projectFolder The folder of the project. It needs a sandstone.config.ts, and it or one of its parent needs a package.json.
- */
-export declare function buildProject(options: BuildOptions, folders: ProjectFolders): Promise<void>;
-export {};