stacks 0.52.10 → 0.56.3

package/core/utils/src/helpers.ts

@@ -1,10 +1,11 @@
+import type { AddressInfo } from 'node:net'
 import type { CliOptions, CommandResult, Manifest, NpmScript } from '@stacksjs/types'
-import detectIndent from 'detect-indent'
 import { frameworkPath, projectPath } from '@stacksjs/path'
 import { parse } from 'yaml'
-import { log, runCommand, spawn } from '@stacksjs/cli'
-import storage from '@stacksjs/storage'
+import { execSync, log, runCommand, spawn } from '@stacksjs/cli'
 import { app, ui } from '@stacksjs/config'
+import * as storage from '@stacksjs/storage'
+import { semver } from './versions'
 
 export async function isProjectCreated() {
   if (storage.isFile('.env'))
@@ -17,9 +18,29 @@ export async function isProjectCreated() {
   return await isAppKeySet()
 }
 
+export async function installIfVersionMismatch() {
+  const dependenciesYaml = storage.fs.readFileSync(projectPath('tea.yaml'), 'utf8')
+  const dependencies = parseYaml(dependenciesYaml).dependencies
+
+  const requiredNodeVersion = dependencies['nodejs.org']
+  const requiredPnpmVersion = dependencies['pnpm.io']
+
+  const installedNodeVersion = process.version
+  const installedPnpmVersion = execSync('pnpm -v').trim()
+
+  if (!semver.satisfies(installedNodeVersion, requiredNodeVersion)) {
+    log.error(`Installed Node.js version (${installedNodeVersion}) does not satisfy required version (${requiredNodeVersion}). One moment...`)
+    await runCommand(`tea +nodejs.org${requiredNodeVersion} >/dev/null 2>&1`)
+  }
+
+  if (!semver.satisfies(installedPnpmVersion, requiredPnpmVersion)) {
+    log.error(`Installed pnpm version (${installedPnpmVersion}) does not satisfy required version (${requiredPnpmVersion}). One moment...`)
+    await runCommand(`tea +pnpm.io${requiredPnpmVersion} >/dev/null 2>&1`)
+  }
+}
+
 export async function frameworkVersion(): Promise<string> {
-  const packageJson = await storage.fs.readJson(frameworkPath('package.json'))
-  return packageJson.version
+  return (await storage.readPackageJson(frameworkPath('package.json'))).version
 }
 
 export async function isAppKeySet() {
@@ -27,10 +48,7 @@ export async function isAppKeySet() {
   const lines = env.data.split('\n')
   const appKey = lines.find(line => line.startsWith('APP_KEY='))
 
-  if (appKey && appKey.length > 16)
-    return true
-
-  return false
+  return !!(appKey && appKey.length > 16)
 }
 
 /**
@@ -139,7 +157,13 @@ export function determineDebugLevel(options?: CliOptions) {
   return app.debug === true
 }
 
-// export { SemVer } from 'semver'
+export function isIpv6(address: AddressInfo): boolean {
+  return address.family === 'IPv6'
+  // in node >=18.0 <18.4 this was an integer value. This was changed in a minor version.
+  // See: https://github.com/laravel/vite-plugin/issues/103
 
-export { detectIndent }
-export { detectNewline } from 'detect-newline'
+    // @ts-expect-error-next-line
+    || address.family === 6
+}
+
+// export { SemVer } from 'semver'

package/core/utils/src/vendors.ts

@@ -145,6 +145,7 @@ export {
   useTimestamp,
   useTitle,
   useTransition,
+  useToggle,
   useUrlSearchParams,
   useUserMedia,
   useVModel,

package/core/validation/build.config.ts

@@ -1,15 +1,25 @@
-import { defineBuildConfig } from 'unbuild'
+import { alias, defineBuildConfig } from '@stacksjs/development'
 
 export default defineBuildConfig({
+  alias,
+
   entries: [
-    {
-      builder: 'mkdist',
-      input: './src/',
-      outDir: './dist/',
-      format: 'esm',
-    },
+    './src/index',
+  ],
+
+  externals: [
+    '@vinejs/vine',
+    'vite',
+    'validator',
+    '@stacksjs/path',
+    '@stacksjs/utils',
+    '@stacksjs/types',
   ],
 
+  rollup: {
+    inlineDependencies: true,
+  },
+
   clean: true,
-  declaration: true,
+  declaration: false, // todo: this should be set to true
 })

package/core/validation/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stacksjs/validation",
   "type": "module",
-  "version": "0.52.10",
-  "packageManager": "pnpm@8.5.1",
+  "version": "0.56.3",
+  "packageManager": "pnpm@8.6.5",
   "description": "The Stacks Validation methods.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -25,12 +25,10 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs"
     }
   },
   "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "contributors": [
     "Chris Breuer <chris@ow3.org>"
   ],
@@ -41,11 +39,15 @@
   "scripts": {
     "build": "unbuild",
     "dev": "unbuild --stub",
-    "prepublishOnly": "pnpm run build",
+    "prepublishOnly": "unbuild",
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "zod": "^3.21.4"
+    "@stacksjs/utils": "workspace:*",
+    "@vinejs/vine": "^1.4.1"
+  },
+  "dependencies": {
+    "@vinejs/vine": "^1.4.1"
   },
   "devDependencies": {
     "@stacksjs/development": "workspace:*",

package/core/validation/src/index.ts

@@ -1,2 +1,4 @@
 export * from './is'
+export * from './rules'
 export * from './validate'
+export * from './types'

package/core/validation/src/is.ts

@@ -1,257 +1,110 @@
 import { getTypeName, toString } from '@stacksjs/utils'
-import validator from 'validator'
-import type { HashAlgorithm } from '@stacksjs/types'
-
-export function isEmail(email: string) {
-  return validator.isEmail(email)
-}
-
-export function isStrongPassword(password: string) {
-  return validator.isStrongPassword(password)
-}
-
-export function isAlphanumeric(username: string) {
-  return validator.isAlphanumeric(username)
-}
-
-export function validateUsername(username: string) {
-  return isAlphanumeric(username)
-}
-
-export function isURL(url: string) {
-  return validator.isURL(url)
-}
-
-export function isMobilePhone(phoneNumber: string) {
-  return validator.isMobilePhone(phoneNumber)
-}
-
-export function isAlpha(name: string) {
-  return validator.isAlpha(name)
-}
-
-export function isPostalCode(zipCode: string) {
-  return validator.isPostalCode(zipCode, 'any')
-}
-
-export function isNumeric(number: string) {
-  return validator.isNumeric(number)
-}
-
-export function isHexColor(color: string) {
-  return validator.isHexColor(color)
-}
-
-export function isHexadecimal(hex: string) {
-  return validator.isHexadecimal(hex)
-}
-
-export function isBase64(base64: string) {
-  return validator.isBase64(base64)
-}
-
-export function isUUID(uuid: string) {
-  return validator.isUUID(uuid)
-}
-
-export function isJSON(json: string) {
-  return validator.isJSON(json)
-}
-
-export function isCreditCard(creditCard: string) {
-  return validator.isCreditCard(creditCard)
-}
-
-export function isISBN(isbn: string) {
-  return validator.isISBN(isbn)
-}
-
-export function isIP(ip: string) {
-  return validator.isIP(ip)
-}
-
-export function isIPRange(ip: string) {
-  return validator.isIPRange(ip)
-}
-
-export function isMACAddress(macAddress: string) {
-  return validator.isMACAddress(macAddress)
-}
-
-export function isLatLong(latitude: string) {
-  return validator.isLatLong(latitude)
-}
-
-export function isLatitude(longitude: string) {
-  return validator.isLatLong(longitude)
-}
-
-export function isLongitude(longitude: string) {
-  return validator.isLatLong(longitude)
-}
-
-export function isCurrency(currency: string) {
-  return validator.isCurrency(currency)
-}
-
-export function isDataURI(dataURI: string) {
-  return validator.isDataURI(dataURI)
-}
-
-export function isMimeType(mimeType: string) {
-  return validator.isMimeType(mimeType)
-}
-
-export function isJWT(jwt: string) {
-  return validator.isJWT(jwt)
-}
-
-export function isMongoId(mongoId: string) {
-  return validator.isMongoId(mongoId)
-}
-
-export function isAscii(ascii: string) {
-  return validator.isAscii(ascii)
-}
-
-export function isBase32(base32: string) {
-  return validator.isBase32(base32)
-}
-
-export function isByteLength(byteLength: string) {
-  return validator.isByteLength(byteLength)
-}
-
-export function isFQDN(fqdn: string) {
-  return validator.isFQDN(fqdn)
-}
-
-export function isFullWidth(fullWidth: string) {
-  return validator.isFullWidth(fullWidth)
-}
-
-export function isHalfWidth(halfWidth: string) {
-  return validator.isHalfWidth(halfWidth)
-}
-
-export function isHash(hash: string, algorithm: HashAlgorithm) {
-  return validator.isHash(hash, algorithm)
-}
-
-export function isHSL(hsl: string) {
-  return validator.isHSL(hsl)
-}
-
-export function isIBAN(iban: string) {
-  return validator.isIBAN(iban)
-}
-
-export function isIdentityCard(identityCard: string) {
-  return validator.isIdentityCard(identityCard)
-}
-
-export function isISIN(isin: string) {
-  return validator.isISIN(isin)
-}
-
-export function isISO8601(iso8601: string) {
-  return validator.isISO8601(iso8601)
-}
-
-export function isISRC(isrc: string) {
-  return validator.isISRC(isrc)
-}
-
-export function isISSN(issn: string) {
-  return validator.isISSN(issn)
-}
-
-export function isISO31661Alpha2(iso31661Alpha2: string) {
-  return validator.isISO31661Alpha2(iso31661Alpha2)
-}
-
-export function isISO31661Alpha3(iso31661Alpha3: string) {
-  return validator.isISO31661Alpha3(iso31661Alpha3)
-}
 
 export function isDef<T = any>(val?: T): val is T {
   return typeof val !== 'undefined'
 }
+
 export function isBoolean(val: any): val is boolean {
   return typeof val === 'boolean'
 }
+
 export function isFunction<T extends Function>(val: any): val is T {
   return typeof val === 'function'
 }
+
 export function isNumber(val: any): val is number {
   return typeof val === 'number'
 }
+
 export function isString(val: unknown): val is string {
   return typeof val === 'string'
 }
+
 export function isObject(val: any): val is object {
   return toString(val) === '[object Object]'
 }
+
 export function isWindow(val: any): boolean {
   return typeof window !== 'undefined' && toString(val) === '[object Window]'
 }
+
 export const isBrowser = typeof window !== 'undefined'
+
 export const isServer = typeof document === 'undefined' // https://remix.run/docs/en/v1/pages/gotchas#typeof-window-checks
+
 export function isMap(val: any): val is Map<any, any> {
   return toString(val) === '[object Map]'
 }
+
 export function isSet(val: any): val is Set<any> {
   return toString(val) === '[object Set]'
 }
+
 export function isPromise<T = any>(val: any): val is Promise<T> {
   return toString(val) === '[object Promise]'
 }
+
 export function isUndefined(v: any) {
   return getTypeName(v) === 'undefined'
 }
+
 export function isNull(v: any) {
   return getTypeName(v) === 'null'
 }
+
 export function isSymbol(v: any) {
   return getTypeName(v) === 'symbol'
 }
+
 export function isDate(v: any) {
   return getTypeName(v) === 'date'
 }
+
 export function isRegExp(v: any) {
   return getTypeName(v) === 'regexp'
 }
+
 export function isArray(v: any) {
   return getTypeName(v) === 'array'
 }
+
 export function isPrimitive(v: any) {
   const type = getTypeName(v)
   return type === 'null' || type === 'undefined' || type === 'string' || type === 'number' || type === 'boolean' || type === 'symbol'
 }
+
 export function isInteger(v: any) {
   return isNumber(v) && Number.isInteger(v)
 }
+
 export function isFloat(v: any) {
   return isNumber(v) && !Number.isInteger(v)
 }
+
 export function isPositive(v: any) {
   return isNumber(v) && v > 0
 }
+
 export function isNegative(v: any) {
   return isNumber(v) && v < 0
 }
+
 export function isEven(v: any) {
   return isNumber(v) && v % 2 === 0
 }
+
 export function isOdd(v: any) {
   return isNumber(v) && v % 2 !== 0
 }
+
 export function isEvenOrOdd(v: any) {
   return isNumber(v) && (v % 2 === 0 ? 'even' : 'odd')
 }
+
 export function isPositiveOrNegative(v: any) {
   return isNumber(v) && (v > 0 ? 'positive' : 'negative')
 }
+
 export function isIntegerOrFloat(v: any) {
   return isNumber(v) && (Number.isInteger(v) ? 'integer' : 'float')
 }

package/core/validation/src/rules.ts

@@ -0,0 +1,126 @@
+import { USD, currency } from '@stacksjs/utils'
+import { validator } from './validate'
+
+/**
+ * Thanks to VineJS for the following types:
+ *
+ * The context shared with the entire validation pipeline.
+ * Each field gets its own context object.
+ */
+export interface FieldContext {
+  /**
+   * Field value
+   */
+  value: unknown
+
+  /**
+   * The data property is the top-level object under validation.
+   */
+  data: any
+
+  /**
+   * Shared metadata across the entire validation lifecycle. It can be
+   * used to pass data between validation rules
+   */
+  meta: Record<string, any>
+
+  /**
+   * Mutate the value of field under validation.
+   */
+  mutate(newValue: any, field: FieldContext): void
+
+  /**
+   * Report error to the error reporter
+   */
+  report: ErrorReporterContract['report']
+
+  /**
+   * Is this field valid. Default: true
+   */
+  isValid: boolean
+
+  /**
+   * Is this field has value defined.
+   */
+  isDefined: boolean
+
+  /**
+   * Wildcard path for the field. The value is a nested
+   * pointer to the field under validation.
+   *
+   * In case of arrays, the `*` wildcard is used.
+   */
+  wildCardPath: string
+
+  /**
+   * The parent property is the parent of the field. It could be an
+   * array or an object.
+   */
+  parent: any
+
+  /**
+   * Name of the field under validation. In case of an array, the field
+   * name will be a number
+   */
+  name: string | number
+
+  /**
+   * Is this field an array member
+   */
+  isArrayMember: boolean
+}
+
+/**
+ * Thanks to VineJS for the following types:
+ *
+ * The error reporter is used to report errors during the validation
+ * process.
+ */
+export interface ErrorReporterContract {
+  /**
+   * A boolean to known if there are one or more
+   * errors.
+   */
+  hasErrors: boolean
+
+  /**
+   * Creates an instance of an exception to throw
+   */
+  createError(): Error
+
+  /**
+   * Report error for a field
+   */
+  report(message: string, rule: string, field: FieldContext, args?: Record<string, any>): any
+}
+
+// export const isMoney = validator.createRule((value: unknown, _, field: FieldContext) => {
+export const isMoney = validator.createRule((value: unknown, _, field: FieldContext) => {
+  /**
+   * Convert string representation of a number to a JavaScript
+   * Number data type.
+   */
+  const numericValue = validator.helpers.asNumber(value)
+
+  /**
+   * Report error, if the value is NaN post-conversion
+   */
+  if (Number.isNaN(numericValue)) {
+    field.report(
+      'The {{ field }} field value must be a number',
+      'money',
+      field,
+    )
+    return
+  }
+
+  /**
+   * Create amount type
+   */
+  const amount = currency({ amount: numericValue, currency: USD })
+
+  /**
+   * Mutate the field's value
+   */
+  field.mutate(amount, field)
+}) as any