Skip to content

refactor: major overhaul of project structure and entry points #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tony133 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: major overhaul of project structure and entry points #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/example.js → examples/example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'
const S = require('./FluentJSONSchema')
const S = require('../FluentJSONSchema')
const Ajv = require('ajv')

const ROLES = {
Expand Down
24 changes: 12 additions & 12 deletions src/FluentJSONSchema.js → index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
'use strict'

const { FORMATS, TYPES, FluentSchemaError } = require('./utils')

const { BaseSchema } = require('./BaseSchema')
const { NullSchema } = require('./NullSchema')
const { BooleanSchema } = require('./BooleanSchema')
const { StringSchema } = require('./StringSchema')
const { NumberSchema } = require('./NumberSchema')
const { IntegerSchema } = require('./IntegerSchema')
const { ObjectSchema } = require('./ObjectSchema')
const { ArraySchema } = require('./ArraySchema')
const { MixedSchema } = require('./MixedSchema')
const { RawSchema } = require('./RawSchema')
const { FORMATS, TYPES, FluentSchemaError } = require('./lib/utils')

const { BaseSchema } = require('./lib/BaseSchema')
const { NullSchema } = require('./lib/NullSchema')
const { BooleanSchema } = require('./lib/BooleanSchema')
const { StringSchema } = require('./lib/StringSchema')
const { NumberSchema } = require('./lib/NumberSchema')
const { IntegerSchema } = require('./lib/IntegerSchema')
const { ObjectSchema } = require('./lib/ObjectSchema')
const { ArraySchema } = require('./lib/ArraySchema')
const { MixedSchema } = require('./lib/MixedSchema')
const { RawSchema } = require('./lib/RawSchema')

const initialState = {
$schema: 'http://json-schema.org/draft-07/schema#',
Expand Down
0 src/ArraySchema.js → lib/ArraySchema.js
View file
Open in desktop
File renamed without changes.
0 src/BaseSchema.js → lib/BaseSchema.js
View file
Open in desktop
File renamed without changes.
0 src/BooleanSchema.js → lib/BooleanSchema.js
View file
Open in desktop
File renamed without changes.
0 src/IntegerSchema.js → lib/IntegerSchema.js
View file
Open in desktop
File renamed without changes.
0 src/MixedSchema.js → lib/MixedSchema.js
View file
Open in desktop
File renamed without changes.
0 src/NullSchema.js → lib/NullSchema.js
View file
Open in desktop
File renamed without changes.
0 src/NumberSchema.js → lib/NumberSchema.js
View file
Open in desktop
File renamed without changes.
0 src/ObjectSchema.js → lib/ObjectSchema.js
View file
Open in desktop
File renamed without changes.
0 src/RawSchema.js → lib/RawSchema.js
View file
Open in desktop
File renamed without changes.
0 src/StringSchema.js → lib/StringSchema.js
View file
Open in desktop
File renamed without changes.
0 src/schemas/basic.json → lib/schemas/basic.json
View file
Open in desktop
File renamed without changes.
0 src/utils.js → lib/utils.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "fluent-json-schema",
"version": "6.0.0",
"description": "JSON Schema fluent API",
"main": "src/FluentJSONSchema.js",
"main": "index.js",
"type": "commonjs",
"types": "types/FluentJSONSchema.d.ts",
"types": "types/index.d.ts",
"keywords": [
"JSON",
"schema",
Expand Down
4 changes: 2 additions & 2 deletions src/ArraySchema.test.js → test/ArraySchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { ArraySchema } = require('./ArraySchema')
const S = require('./FluentJSONSchema')
const { ArraySchema } = require('../lib/ArraySchema')
const S = require('..')

describe('ArraySchema', () => {
it('defined', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/BaseSchema.test.js → test/BaseSchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { BaseSchema } = require('./BaseSchema')
const S = require('./FluentJSONSchema')
const { BaseSchema } = require('../lib/BaseSchema')
const S = require('..')

describe('BaseSchema', () => {
it('defined', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/BooleanSchema.test.js → test/BooleanSchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { BooleanSchema } = require('./BooleanSchema')
const S = require('./FluentJSONSchema')
const { BooleanSchema } = require('../lib/BooleanSchema')
const S = require('..')

describe('BooleanSchema', () => {
it('defined', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/FluentSchema.integration.test.js → test/FluentSchema.integration.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const assert = require('node:assert/strict')

const Ajv = require('ajv')

const basic = require('./schemas/basic')
const S = require('./FluentJSONSchema')
const basic = require('../lib/schemas/basic')
const S = require('..')

// TODO pick some ideas from here:https://github.com/json-schema-org/JSON-Schema-Test-Suite/tree/main/tests/draft7

Expand Down
2 changes: 1 addition & 1 deletion src/FluentSchema.test.js → test/FluentSchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const S = require('./FluentJSONSchema')
const S = require('..')

describe('S', () => {
it('defined', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/IntegerSchema.test.js → test/IntegerSchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { IntegerSchema } = require('./IntegerSchema')
const S = require('./FluentJSONSchema')
const { IntegerSchema } = require('../lib/IntegerSchema')
const S = require('..')

describe('IntegerSchema', () => {
it('defined', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/MixedSchema.test.js → test/MixedSchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { MixedSchema } = require('./MixedSchema')
const S = require('./FluentJSONSchema')
const { MixedSchema } = require('../lib/MixedSchema')
const S = require('..')

describe('MixedSchema', () => {
it('defined', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/NullSchema.test.js → test/NullSchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { NullSchema } = require('./NullSchema')
const S = require('./FluentJSONSchema')
const { NullSchema } = require('../lib/NullSchema')
const S = require('..')

describe('NullSchema', () => {
it('defined', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/NumberSchema.test.js → test/NumberSchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { NumberSchema } = require('./NumberSchema')
const S = require('./FluentJSONSchema')
const { NumberSchema } = require('../lib/NumberSchema')
const S = require('..')

describe('NumberSchema', () => {
it('defined', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/ObjectSchema.test.js → test/ObjectSchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { ObjectSchema } = require('./ObjectSchema')
const S = require('./FluentJSONSchema')
const { ObjectSchema } = require('../lib/ObjectSchema')
const S = require('..')

describe('ObjectSchema', () => {
it('defined', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/RawSchema.test.js → test/RawSchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { RawSchema } = require('./RawSchema')
const S = require('./FluentJSONSchema')
const { RawSchema } = require('../lib/RawSchema')
const S = require('..')

describe('RawSchema', () => {
it('defined', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/StringSchema.test.js → test/StringSchema.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { StringSchema, FORMATS } = require('./StringSchema')
const S = require('./FluentJSONSchema')
const { StringSchema, FORMATS } = require('../lib/StringSchema')
const S = require('..')

describe('StringSchema', () => {
it('defined', () => {
Expand Down
6 changes: 3 additions & 3 deletions src/utils.test.js → test/utils.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')

const { setRaw, combineDeepmerge } = require('./utils')
const { StringSchema } = require('./StringSchema')
const { ObjectSchema } = require('./ObjectSchema')
const { setRaw, combineDeepmerge } = require('../lib/utils')
const { StringSchema } = require('../lib/StringSchema')
const { ObjectSchema } = require('../lib/ObjectSchema')

describe('setRaw', () => {
it('add an attribute to a prop using ObjectSchema', () => {
Expand Down
0 types/FluentJSONSchema.d.ts → types/index.d.ts
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion types/FluentJSONSchema.tst.ts → types/index.tst.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { expect } from 'tstyche'

import S, { FluentSchemaError } from '..'

// isFluentJSONSchema and isFluentSchema properties
Expand Down
Loading