millas 0.1.0 → 0.1.2

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "millas",
-  "version": "0.1.0",
-  "publishConfig": {
-    "access": "public"
-  },
+  "version": "0.1.02",
   "description": "A modern batteries-included backend framework for Node.js — built on Express, inspired by Laravel, Django, and FastAPI",
   "main": "src/index.js",
+  "exports": {
+    ".":        "./src/index.js",
+    "./src":    "./src/index.js",
+    "./src/*":  "./src/*.js",
+    "./bin/*":  "./bin/*.js"
+  },
   "bin": {
     "millas": "./bin/millas.js"
   },
@@ -24,14 +27,14 @@
   },
   "dependencies": {
     "bcryptjs":    "^3.0.3",
-    "chalk": "^5.6.2",
+    "chalk":       "4.1.2",
     "commander":   "^11.0.0",
     "fs-extra":    "^11.0.0",
-    "inquirer":    "^8.2.6",
+    "inquirer":    "8.2.6",
     "jsonwebtoken":"^9.0.3",
     "knex":        "^3.1.0",
-    "nodemailer": "^8.0.2",
-    "ora":         "^5.4.1"
+    "nodemailer":  "^6.9.0",
+    "ora":         "5.4.1"
   },
   "peerDependencies": {
     "express": "^4.18.0"

package/src/scaffold/maker.js

@@ -37,7 +37,7 @@ async function makeController(name, options = {}) {
   const content = resource
     ? `'use strict';
 
-const { Controller } = require('millas/src');
+const { Controller } = require('millas');
 
 /**
  * ${className}
@@ -81,7 +81,7 @@ module.exports = ${className};
 `
     : `'use strict';
 
-const { Controller } = require('millas/src');
+const { Controller } = require('millas');
 
 /**
  * ${className}
@@ -105,7 +105,7 @@ async function makeModel(name, options = {}) {
 
   const content = `'use strict';
 
-const { Model, fields } = require('millas/src');
+const { Model, fields } = require('millas');
 
 /**
  * ${className} Model
@@ -142,7 +142,7 @@ async function makeMiddleware(name) {
 
   const content = `'use strict';
 
-const { Middleware } = require('millas/src');
+const { Middleware } = require('millas');
 
 /**
  * ${className}

package/src/scaffold/templates.js

@@ -11,11 +11,13 @@ function getProjectFiles(projectName) {
       main: 'bootstrap/app.js',
       scripts: {
         start: 'node bootstrap/app.js',
-        dev: 'millas serve',
+        dev:   'millas serve',
+        serve: 'millas serve',
       },
       dependencies: {
+        millas:  'latest',
         express: '^4.18.2',
-        dotenv: '^16.0.3',
+        dotenv:  '^16.0.3',
       },
     }, null, 2),
 
@@ -86,9 +88,40 @@ module.exports = {
 
 require('dotenv').config();
 
-const express              = require('express');
-const { Application }      = require('millas/src');
-const AppServiceProvider   = require('../providers/AppServiceProvider');
+const express = require('express');
+
+/**
+ * Resolve the millas package whether installed locally (node_modules)
+ * or used from a globally installed CLI (millas serve).
+ */
+function resolveMillas() {
+  // 1. Try local node_modules first (preferred)
+  try { return require('millas/src'); } catch {}
+  // 2. Try resolving from the global CLI location
+  try {
+    const path     = require('path');
+    const cliPath  = require.resolve('millas/bin/millas.js');
+    const millasSrc = path.join(path.dirname(cliPath), '..', 'src', 'index.js');
+    return require(millasSrc);
+  } catch {}
+  throw new Error(
+    'Cannot find millas. Run: npm install millas\\n' +
+    'Or install globally: npm install -g millas'
+  );
+}
+
+const {
+  Application,
+  DatabaseServiceProvider,
+  CacheServiceProvider,
+  StorageServiceProvider,
+  MailServiceProvider,
+  QueueServiceProvider,
+  EventServiceProvider,
+  AuthServiceProvider,
+} = resolveMillas();
+
+const AppServiceProvider = require('../providers/AppServiceProvider');
 
 const expressApp = express();
 expressApp.use(express.json());
@@ -99,8 +132,13 @@ const app = new Application(expressApp);
 
 // ── Register service providers ──────────────────────────────────
 app.providers([
+  CacheServiceProvider,
+  StorageServiceProvider,
+  MailServiceProvider,
+  QueueServiceProvider,
+  EventServiceProvider,
   AppServiceProvider,
-  // Add more providers here as you build your app
+  // AuthServiceProvider,  // uncomment when you have a User model
 ]);
 
 // ── Define routes ────────────────────────────────────────────────
@@ -119,7 +157,7 @@ app.routes(Route => {
   }
 })();
 
-module.exports = { app, expressApp };
+module.exports = { app, expressApp, get route() { return app.route; } };
 `,
 
     // ─── routes/web.js ────────────────────────────────────────────
@@ -267,16 +305,25 @@ module.exports = {
     // ─── providers/AppServiceProvider.js ──────────────────────────
     'providers/AppServiceProvider.js': `'use strict';
 
-const { ServiceProvider } = require('millas/src');
+function resolveMillas() {
+  try { return require('millas/src'); } catch {}
+  try {
+    const path = require('path');
+    const cli  = require.resolve('millas/bin/millas.js');
+    return require(path.join(path.dirname(cli), '..', 'src', 'index.js'));
+  } catch {}
+  throw new Error('Cannot find millas. Run: npm install millas');
+}
+
+const { ServiceProvider } = resolveMillas();
 
 /**
  * AppServiceProvider
  *
- * Register and bootstrap your application's services here.
+ * Register and bootstrap your application services here.
  *
  * register()  — bind things into the container
- * boot()      — called after all providers have registered;
- *               safe to resolve other bindings here
+ * boot()      — called after all providers have registered
  */
 class AppServiceProvider extends ServiceProvider {
   register(container) {
@@ -287,7 +334,6 @@ class AppServiceProvider extends ServiceProvider {
 
   async boot(container, app) {
     // const logger = container.make('Logger');
-    // logger.info('App booted');
   }
 }